From 64de77f5c6e931b883c05ab69777a98302ab0ac3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 00:10:49 -0700 Subject: [PATCH 01/70] Bumping gaia.json for 5 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e5c7172dd79a Author: James Lal Desc: Merge pull request #25059 from lightsofapollo/bug-1081579 Bug 1081579 ======== https://hg.mozilla.org/integration/gaia-central/rev/b23b4526948c Author: James Lal Desc: Bug 1081579 - Add caching logic to entrypoint for git clone cache ======== https://hg.mozilla.org/integration/gaia-central/rev/ff1e63e11084 Author: James Lal Desc: Bug 1076686 - Use buildbot step formatting in ./bin/entrypoint to get correct treeherder parsing ======== https://hg.mozilla.org/integration/gaia-central/rev/8bb8fd01cd68 Author: Greg Weng Desc: Merge pull request #25338 from snowmantw/bug1069879-2.2-rev1 Bug 1069879 - Only three dots shown when entering passcode ======== https://hg.mozilla.org/integration/gaia-central/rev/f4095695b586 Author: Greg Weng Desc: Bug 1069879 - Only three dots shown when entering passcode --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6f1e1f46f89e..dec7e4ffaeef 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ce8e42aa3688f56113d68bc82409a7fea055547b", + "revision": "e5c7172dd79aa5fd4138a7deeb53044f9be19c48", "repo_path": "/integration/gaia-central" } From 832c7ea3393be63c7b635b511eb1a99d414eeaa9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 00:17:04 -0700 Subject: [PATCH 02/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 48a9d26eacb8..f011c2dec04a 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 96d2e52b7200..56546d7228e9 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a5fb45d33153..19b656ddd177 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 0f1efaf24608..1e0c1f738bd1 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 96d2e52b7200..56546d7228e9 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 9b5bb26187b2..7874e7bf0cc0 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 01b22125430f..e4d963c6d85e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a7d4e133f8c0..eb895c63cd2c 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index fdabf84bd45e..9d92b8927c0d 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ea03f5f4f2b4..e28b201d8de4 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index bc84d072f416..d1ba068152aa 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 26fc750617f00f86f2f47606dec4809ea2c0f309 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 00:40:48 -0700 Subject: [PATCH 03/70] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ed99f38cca57 Author: Julien Wajsberg Desc: Bug 1080556 - Intermittent bluetooth/test/unit/transfer_test.js r=stas --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index dec7e4ffaeef..b08c8474998e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e5c7172dd79aa5fd4138a7deeb53044f9be19c48", + "revision": "ed99f38cca5744303fe178434a91ed747c87e739", "repo_path": "/integration/gaia-central" } From a6c138bb9101096f0df5c9cafcae636bcff2a0dc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 00:42:36 -0700 Subject: [PATCH 04/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f011c2dec04a..26d9a1eec878 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 56546d7228e9..613a99089fcb 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 19b656ddd177..c390de778114 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 1e0c1f738bd1..7cfb1e95e25b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 56546d7228e9..613a99089fcb 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 7874e7bf0cc0..54e3120e8769 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index e4d963c6d85e..92b983f165c9 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index eb895c63cd2c..23e30207877d 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9d92b8927c0d..245d758b4276 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e28b201d8de4..f78c552965df 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index d1ba068152aa..fcbd248bf0d6 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4c5c37684ecd676050f91dcc11e38d7cb85d2a44 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 01:10:48 -0700 Subject: [PATCH 05/70] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/325f3c801091 Author: Marina Desc: Merge pull request #25333 from gitmai/bug-825289-add-contact-disable-suggestions-in-zipcode-field Bug 825289 - Some fields in 'Add Contact' enable word suggestions but ar... r=jmcf ======== https://hg.mozilla.org/integration/gaia-central/rev/d8ab5116ae58 Author: mai Desc: Bug 825289 - Some fields in 'Add Contact' enable word suggestions but aren't useful --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b08c8474998e..e8fac508e027 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ed99f38cca5744303fe178434a91ed747c87e739", + "revision": "325f3c80109172bae42d00d39b117bdb7416c902", "repo_path": "/integration/gaia-central" } From 5b44b1b6bc50b5c12cbc2870fdf59f06c6c1931a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 01:17:02 -0700 Subject: [PATCH 06/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 26d9a1eec878..05ef5434c1c3 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 613a99089fcb..c20483ba4bec 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index c390de778114..b6cb0a098b9c 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7cfb1e95e25b..7e11555ee2fe 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 613a99089fcb..c20483ba4bec 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 54e3120e8769..c0b08ef4af7c 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 92b983f165c9..483214e2aab0 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 23e30207877d..742e9c1575c5 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 245d758b4276..2bfb629cc975 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index f78c552965df..f4e259c06808 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index fcbd248bf0d6..c3356f2b61cf 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 973c70e366c48d52a23532d403cdd8d953a5cd4c Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 21 Oct 2014 10:52:11 +0200 Subject: [PATCH 07/70] Bug 1083092: Introduce |mozilla::ipc::SocketBase|, r=shawnjohnjr The new class |SocketBase| contains the notification mechanism of |SocketConsumerBase|. The latter still contains I/O methods. --- dom/bluetooth/bluedroid/BluetoothSocket.cpp | 5 ++ dom/bluetooth2/bluedroid/BluetoothSocket.cpp | 5 ++ ipc/unixsocket/SocketBase.cpp | 28 +++++--- ipc/unixsocket/SocketBase.h | 72 +++++++++++--------- ipc/unixsocket/UnixSocket.cpp | 7 ++ 5 files changed, 75 insertions(+), 42 deletions(-) diff --git a/dom/bluetooth/bluedroid/BluetoothSocket.cpp b/dom/bluetooth/bluedroid/BluetoothSocket.cpp index 1be128eafd70..9dc932ad39a5 100644 --- a/dom/bluetooth/bluedroid/BluetoothSocket.cpp +++ b/dom/bluetooth/bluedroid/BluetoothSocket.cpp @@ -143,6 +143,11 @@ public: return mConsumer.get(); } + SocketBase* GetSocketBase() + { + return GetConsumer(); + } + /** * Consumer pointer. Non-thread safe RefPtr, so should only be manipulated * directly from main thread. All non-main-thread accesses should happen with diff --git a/dom/bluetooth2/bluedroid/BluetoothSocket.cpp b/dom/bluetooth2/bluedroid/BluetoothSocket.cpp index f63ccb9b6f67..fdca68574077 100644 --- a/dom/bluetooth2/bluedroid/BluetoothSocket.cpp +++ b/dom/bluetooth2/bluedroid/BluetoothSocket.cpp @@ -143,6 +143,11 @@ public: return mConsumer.get(); } + SocketBase* GetSocketBase() + { + return GetConsumer(); + } + /** * Consumer pointer. Non-thread safe RefPtr, so should only be manipulated * directly from main thread. All non-main-thread accesses should happen with diff --git a/ipc/unixsocket/SocketBase.cpp b/ipc/unixsocket/SocketBase.cpp index fe8a7018c38a..37334a149f43 100644 --- a/ipc/unixsocket/SocketBase.cpp +++ b/ipc/unixsocket/SocketBase.cpp @@ -94,16 +94,16 @@ UnixSocketRawData::Send(int aFd) } // -// SocketConsumerBase +// SocketBase // -SocketConsumerBase::~SocketConsumerBase() +SocketBase::~SocketBase() { MOZ_ASSERT(mConnectionStatus == SOCKET_DISCONNECTED); } SocketConnectionStatus -SocketConsumerBase::GetConnectionStatus() const +SocketBase::GetConnectionStatus() const { MOZ_ASSERT(NS_IsMainThread()); @@ -111,7 +111,7 @@ SocketConsumerBase::GetConnectionStatus() const } int -SocketConsumerBase::GetSuggestedConnectDelayMs() const +SocketBase::GetSuggestedConnectDelayMs() const { MOZ_ASSERT(NS_IsMainThread()); @@ -119,7 +119,7 @@ SocketConsumerBase::GetSuggestedConnectDelayMs() const } void -SocketConsumerBase::NotifySuccess() +SocketBase::NotifySuccess() { MOZ_ASSERT(NS_IsMainThread()); @@ -129,7 +129,7 @@ SocketConsumerBase::NotifySuccess() } void -SocketConsumerBase::NotifyError() +SocketBase::NotifyError() { MOZ_ASSERT(NS_IsMainThread()); @@ -140,7 +140,7 @@ SocketConsumerBase::NotifyError() } void -SocketConsumerBase::NotifyDisconnect() +SocketBase::NotifyDisconnect() { MOZ_ASSERT(NS_IsMainThread()); @@ -151,7 +151,7 @@ SocketConsumerBase::NotifyDisconnect() } uint32_t -SocketConsumerBase::CalculateConnectDelayMs() const +SocketBase::CalculateConnectDelayMs() const { MOZ_ASSERT(NS_IsMainThread()); @@ -170,19 +170,25 @@ SocketConsumerBase::CalculateConnectDelayMs() const return connectDelayMs; } -SocketConsumerBase::SocketConsumerBase() +SocketBase::SocketBase() : mConnectionStatus(SOCKET_DISCONNECTED) , mConnectTimestamp(0) , mConnectDelayMs(0) { } void -SocketConsumerBase::SetConnectionStatus( - SocketConnectionStatus aConnectionStatus) +SocketBase::SetConnectionStatus(SocketConnectionStatus aConnectionStatus) { mConnectionStatus = aConnectionStatus; } +// +// SocketConsumerBase +// + +SocketConsumerBase::~SocketConsumerBase() +{ } + // // SocketIOBase // diff --git a/ipc/unixsocket/SocketBase.h b/ipc/unixsocket/SocketBase.h index 5bb41efdbdc5..77cb64af32c8 100644 --- a/ipc/unixsocket/SocketBase.h +++ b/ipc/unixsocket/SocketBase.h @@ -106,15 +106,15 @@ enum SocketConnectionStatus { }; // -// SocketConsumerBase +// SocketBase // -class SocketConsumerBase +class SocketBase { public: - NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SocketConsumerBase) + NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SocketBase) - virtual ~SocketConsumerBase(); + virtual ~SocketBase(); SocketConnectionStatus GetConnectionStatus() const; @@ -126,24 +126,6 @@ public: */ virtual void CloseSocket() = 0; - /** - * Function to be called whenever data is received. This is only called on the - * main thread. - * - * @param aMessage Data received from the socket. - */ - virtual void ReceiveSocketData(nsAutoPtr& aMessage) = 0; - - /** - * Queue data to be sent to the socket on the IO thread. Can only be called on - * originating thread. - * - * @param aMessage Data to be sent to socket - * - * @return true if data is queued, false otherwise (i.e. not connected) - */ - virtual bool SendSocketData(UnixSocketRawData* aMessage) = 0; - /** * Callback for socket connect/accept success. Called after connect/accept has * finished. Will be run on main thread, before any reads take place. @@ -176,7 +158,7 @@ public: void NotifyDisconnect(); protected: - SocketConsumerBase(); + SocketBase(); void SetConnectionStatus(SocketConnectionStatus aConnectionStatus); @@ -188,6 +170,34 @@ private: uint32_t mConnectDelayMs; }; +// +// SocketConsumerBase +// + +class SocketConsumerBase : public SocketBase +{ +public: + virtual ~SocketConsumerBase(); + + /** + * Function to be called whenever data is received. This is only called on the + * main thread. + * + * @param aMessage Data received from the socket. + */ + virtual void ReceiveSocketData(nsAutoPtr& aMessage) = 0; + + /** + * Queue data to be sent to the socket on the IO thread. Can only be called on + * originating thread. + * + * @param aMessage Data to be sent to socket + * + * @return true if data is queued, false otherwise (i.e. not connected) + */ + virtual bool SendSocketData(UnixSocketRawData* aMessage) = 0; +}; + // // Socket I/O runnables // @@ -249,15 +259,15 @@ public: return NS_OK; } - SocketConsumerBase* consumer = io->GetConsumer(); - MOZ_ASSERT(consumer); + SocketBase* base = io->GetSocketBase(); + MOZ_ASSERT(base); if (mEvent == CONNECT_SUCCESS) { - consumer->NotifySuccess(); + base->NotifySuccess(); } else if (mEvent == CONNECT_ERROR) { - consumer->NotifyError(); + base->NotifyError(); } else if (mEvent == DISCONNECT) { - consumer->NotifyDisconnect(); + base->NotifyDisconnect(); } return NS_OK; @@ -325,10 +335,10 @@ public: return NS_OK; } - SocketConsumerBase* consumer = io->GetConsumer(); - MOZ_ASSERT(consumer); + SocketBase* base = io->GetSocketBase(); + MOZ_ASSERT(base); - consumer->CloseSocket(); + base->CloseSocket(); return NS_OK; } diff --git a/ipc/unixsocket/UnixSocket.cpp b/ipc/unixsocket/UnixSocket.cpp index 38afd5bc30bc..dff038b9c733 100644 --- a/ipc/unixsocket/UnixSocket.cpp +++ b/ipc/unixsocket/UnixSocket.cpp @@ -31,6 +31,7 @@ public: void GetSocketAddr(nsAString& aAddrStr) const; SocketConsumerBase* GetConsumer(); + SocketBase* GetSocketBase(); // Shutdown state // @@ -157,6 +158,12 @@ UnixSocketConsumerIO::GetConsumer() return mConsumer.get(); } +SocketBase* +UnixSocketConsumerIO::GetSocketBase() +{ + return GetConsumer(); +} + bool UnixSocketConsumerIO::IsShutdownOnMainThread() const { From 51eba88842220e9e824bb1d543208d54669a774b Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 21 Oct 2014 10:52:12 +0200 Subject: [PATCH 08/70] Bug 1083092: Data parameter for |mozilla::ipc::SocketIOSendTask| template, r=shawnjohnjr The data class in |SocketIOSendTask| is now a template parameter, instead of being hard-coded to |UnixSocketRawData|. The patch also adds soem minor cleanups to the file. --- dom/bluetooth/bluedroid/BluetoothSocket.cpp | 3 +- dom/bluetooth2/bluedroid/BluetoothSocket.cpp | 2 +- ipc/unixsocket/SocketBase.h | 39 ++++++++++---------- ipc/unixsocket/UnixSocket.cpp | 3 +- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dom/bluetooth/bluedroid/BluetoothSocket.cpp b/dom/bluetooth/bluedroid/BluetoothSocket.cpp index 9dc932ad39a5..1b4c1dd1b402 100644 --- a/dom/bluetooth/bluedroid/BluetoothSocket.cpp +++ b/dom/bluetooth/bluedroid/BluetoothSocket.cpp @@ -666,7 +666,8 @@ BluetoothSocket::SendSocketData(UnixSocketRawData* aData) MOZ_ASSERT(!mImpl->IsShutdownOnMainThread()); XRE_GetIOMessageLoop()->PostTask( - FROM_HERE, new SocketIOSendTask(mImpl, aData)); + FROM_HERE, + new SocketIOSendTask(mImpl, aData)); return true; } diff --git a/dom/bluetooth2/bluedroid/BluetoothSocket.cpp b/dom/bluetooth2/bluedroid/BluetoothSocket.cpp index fdca68574077..8368790bd1e2 100644 --- a/dom/bluetooth2/bluedroid/BluetoothSocket.cpp +++ b/dom/bluetooth2/bluedroid/BluetoothSocket.cpp @@ -666,7 +666,7 @@ BluetoothSocket::SendSocketData(UnixSocketRawData* aData) MOZ_ASSERT(!mImpl->IsShutdownOnMainThread()); XRE_GetIOMessageLoop()->PostTask( - FROM_HERE, new SocketIOSendTask(mImpl, aData)); + FROM_HERE, new SocketIOSendTask(mImpl, aData)); return true; } diff --git a/ipc/unixsocket/SocketBase.h b/ipc/unixsocket/SocketBase.h index 77cb64af32c8..26c88618d587 100644 --- a/ipc/unixsocket/SocketBase.h +++ b/ipc/unixsocket/SocketBase.h @@ -463,14 +463,14 @@ private: /* |SocketIOTask| holds a reference to a Socket I/O object. It's * supposed to run on the I/O thread. */ -template +template class SocketIOTask : public CancelableTask { public: virtual ~SocketIOTask() { } - T* GetIO() const + Tio* GetIO() const { return mIO; } @@ -486,25 +486,26 @@ public: } protected: - SocketIOTask(T* aIO) + SocketIOTask(Tio* aIO) : mIO(aIO) { MOZ_ASSERT(mIO); } private: - T* mIO; + Tio* mIO; }; -/* |SocketIOSendTask| transfers an instance of |UnixSocketRawData| to - * the I/O thread and queues it up for sending the contained data. +/* |SocketIOSendTask| transfers an instance of |Tdata|, such as + * |UnixSocketRawData|, to the I/O thread and queues it up for + * sending the contained data. */ -template -class SocketIOSendTask MOZ_FINAL : public SocketIOTask +template +class SocketIOSendTask MOZ_FINAL : public SocketIOTask { public: - SocketIOSendTask(T* aIO, UnixSocketRawData* aData) - : SocketIOTask(aIO) + SocketIOSendTask(Tio* aIO, Tdata* aData) + : SocketIOTask(aIO) , mData(aData) { MOZ_ASSERT(aData); @@ -513,34 +514,34 @@ public: void Run() MOZ_OVERRIDE { MOZ_ASSERT(!NS_IsMainThread()); - MOZ_ASSERT(!SocketIOTask::IsCanceled()); + MOZ_ASSERT(!SocketIOTask::IsCanceled()); - T* io = SocketIOTask::GetIO(); + Tio* io = SocketIOTask::GetIO(); MOZ_ASSERT(!io->IsShutdownOnIOThread()); io->Send(mData); } private: - UnixSocketRawData* mData; + Tdata* mData; }; /* |SocketIOShutdownTask| signals shutdown to the Socket I/O object on * the I/O thread and sends it to the main thread for destruction. */ -template -class SocketIOShutdownTask MOZ_FINAL : public SocketIOTask +template +class SocketIOShutdownTask MOZ_FINAL : public SocketIOTask { public: - SocketIOShutdownTask(T* aIO) - : SocketIOTask(aIO) + SocketIOShutdownTask(Tio* aIO) + : SocketIOTask(aIO) { } void Run() MOZ_OVERRIDE { MOZ_ASSERT(!NS_IsMainThread()); - T* io = SocketIOTask::GetIO(); + Tio* io = SocketIOTask::GetIO(); // At this point, there should be no new events on the I/O thread // after this one with the possible exception of an accept task, @@ -549,7 +550,7 @@ public: // |io| safely knowing that it's not reference any longer. io->ShutdownOnIOThread(); - nsRefPtr r = new SocketIODeleteInstanceRunnable(io); + nsRefPtr r = new SocketIODeleteInstanceRunnable(io); nsresult rv = NS_DispatchToMainThread(r); NS_ENSURE_SUCCESS_VOID(rv); } diff --git a/ipc/unixsocket/UnixSocket.cpp b/ipc/unixsocket/UnixSocket.cpp index dff038b9c733..369578508b4f 100644 --- a/ipc/unixsocket/UnixSocket.cpp +++ b/ipc/unixsocket/UnixSocket.cpp @@ -555,7 +555,8 @@ UnixSocketConsumer::SendSocketData(UnixSocketRawData* aData) MOZ_ASSERT(!mIO->IsShutdownOnMainThread()); XRE_GetIOMessageLoop()->PostTask( - FROM_HERE, new SocketIOSendTask(mIO, aData)); + FROM_HERE, + new SocketIOSendTask(mIO, aData)); return true; } From 7c3cf9bdb8739b23034ad7387ca1ba4d5582843f Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 21 Oct 2014 10:52:12 +0200 Subject: [PATCH 09/70] Bug 1083092: Add |mozilla::ipc::UnixSocketIOBuffer|, r=shawnjohnjr The class |UnixSocketIOBuffer| maintains memory buffers for socket I/O operations. The actual I/O is still implemented by subclasses, such as |UnixSocketRawData|. --- ipc/unixsocket/SocketBase.cpp | 93 +++++++++++++++-- ipc/unixsocket/SocketBase.h | 189 +++++++++++++++++++++++++--------- 2 files changed, 225 insertions(+), 57 deletions(-) diff --git a/ipc/unixsocket/SocketBase.cpp b/ipc/unixsocket/SocketBase.cpp index 37334a149f43..eb0607c34841 100644 --- a/ipc/unixsocket/SocketBase.cpp +++ b/ipc/unixsocket/SocketBase.cpp @@ -15,10 +15,10 @@ namespace mozilla { namespace ipc { // -// UnixSocketRawData +// UnixSocketIOBuffer // -UnixSocketRawData::UnixSocketRawData(const void* aData, size_t aSize) +UnixSocketIOBuffer::UnixSocketIOBuffer(const void* aData, size_t aSize) : mSize(aSize) , mOffset(0) , mAvailableSpace(aSize) @@ -29,14 +29,90 @@ UnixSocketRawData::UnixSocketRawData(const void* aData, size_t aSize) memcpy(mData, aData, mSize); } -UnixSocketRawData::UnixSocketRawData(size_t aSize) +UnixSocketIOBuffer::UnixSocketIOBuffer(size_t aAvailableSpace) : mSize(0) , mOffset(0) -, mAvailableSpace(aSize) +, mAvailableSpace(aAvailableSpace) { mData = new uint8_t[mAvailableSpace]; } +UnixSocketIOBuffer::~UnixSocketIOBuffer() +{ } + +const uint8_t* +UnixSocketIOBuffer::Consume(size_t aLen) +{ + if (NS_WARN_IF(GetSize() < aLen)) { + return nullptr; + } + uint8_t* data = mData + mOffset; + mOffset += aLen; + return data; +} + +nsresult +UnixSocketIOBuffer::Read(void* aValue, size_t aLen) +{ + const uint8_t* data = Consume(aLen); + if (!data) { + return NS_ERROR_OUT_OF_MEMORY; + } + memcpy(aValue, data, aLen); + return NS_OK; +} + +uint8_t* +UnixSocketIOBuffer::Append(size_t aLen) +{ + if (((mAvailableSpace - mSize) < aLen)) { + size_t availableSpace = mAvailableSpace + std::max(mAvailableSpace, aLen); + uint8_t* data = new uint8_t[availableSpace]; + memcpy(data, mData, mSize); + mData = data; + mAvailableSpace = availableSpace; + } + uint8_t* data = mData + mSize; + mSize += aLen; + return data; +} + +nsresult +UnixSocketIOBuffer::Write(const void* aValue, size_t aLen) +{ + uint8_t* data = Append(aLen); + if (!data) { + return NS_ERROR_OUT_OF_MEMORY; + } + memcpy(data, aValue, aLen); + return NS_OK; +} + +void +UnixSocketIOBuffer::CleanupLeadingSpace() +{ + if (GetLeadingSpace()) { + if (GetSize() <= GetLeadingSpace()) { + memcpy(mData, GetData(), GetSize()); + } else { + memmove(mData, GetData(), GetSize()); + } + mOffset = 0; + } +} + +// +// UnixSocketRawData +// + +UnixSocketRawData::UnixSocketRawData(const void* aData, size_t aSize) +: UnixSocketIOBuffer(aData, aSize) +{ } + +UnixSocketRawData::UnixSocketRawData(size_t aSize) +: UnixSocketIOBuffer(aSize) +{ } + ssize_t UnixSocketRawData::Receive(int aFd) { @@ -45,12 +121,7 @@ UnixSocketRawData::Receive(int aFd) return -1; /* buffer is full */ } /* free up space at the end of data buffer */ - if (GetSize() <= GetLeadingSpace()) { - memcpy(mData, GetData(), GetSize()); - } else { - memmove(mData, GetData(), GetSize()); - } - mOffset = 0; + CleanupLeadingSpace(); } ssize_t res = @@ -64,7 +135,7 @@ UnixSocketRawData::Receive(int aFd) return 0; } - mSize += res; + Append(res); /* mark read data as 'valid' */ return res; } diff --git a/ipc/unixsocket/SocketBase.h b/ipc/unixsocket/SocketBase.h index 26c88618d587..988f0bec0ce5 100644 --- a/ipc/unixsocket/SocketBase.h +++ b/ipc/unixsocket/SocketBase.h @@ -22,11 +22,153 @@ using namespace mozilla::tasktracer; namespace mozilla { namespace ipc { +// +// UnixSocketIOBuffer +// + +class UnixSocketIOBuffer +{ +public: + const uint8_t* GetData() const + { + return mData + mOffset; + } + + size_t GetSize() const + { + return mSize - mOffset; + } + + const uint8_t* Consume(size_t aLen); + + nsresult Read(void* aValue, size_t aLen); + + nsresult Read(int8_t& aValue) + { + return Read(&aValue, sizeof(aValue)); + } + + nsresult Read(uint8_t& aValue) + { + return Read(&aValue, sizeof(aValue)); + } + + nsresult Read(int16_t& aValue) + { + return Read(&aValue, sizeof(aValue)); + } + + nsresult Read(uint16_t& aValue) + { + return Read(&aValue, sizeof(aValue)); + } + + nsresult Read(int32_t& aValue) + { + return Read(&aValue, sizeof(aValue)); + } + + nsresult Read(uint32_t& aValue) + { + return Read(&aValue, sizeof(aValue)); + } + + uint8_t* Append(size_t aLen); + + nsresult Write(const void* aValue, size_t aLen); + + nsresult Write(int8_t aValue) + { + return Write(&aValue, sizeof(aValue)); + } + + nsresult Write(uint8_t aValue) + { + return Write(&aValue, sizeof(aValue)); + } + + nsresult Write(int16_t aValue) + { + return Write(&aValue, sizeof(aValue)); + } + + nsresult Write(uint16_t aValue) + { + return Write(&aValue, sizeof(aValue)); + } + + nsresult Write(int32_t aValue) + { + return Write(&aValue, sizeof(aValue)); + } + + nsresult Write(uint32_t aValue) + { + return Write(&aValue, sizeof(aValue)); + } + +protected: + + /* This constructor copies aData of aSize bytes length into the + * new instance of |UnixSocketIOBuffer|. + */ + UnixSocketIOBuffer(const void* aData, size_t aSize); + + /* This constructor reserves aAvailableSpace bytes of space. + */ + UnixSocketIOBuffer(size_t aAvailableSpace); + + ~UnixSocketIOBuffer(); + + size_t GetLeadingSpace() const + { + return mOffset; + } + + size_t GetTrailingSpace() const + { + return mAvailableSpace - mSize; + } + + size_t GetAvailableSpace() const + { + return mAvailableSpace; + } + + void* GetTrailingBytes() + { + return mData + mSize; + } + + uint8_t* GetData(size_t aOffset) + { + MOZ_ASSERT(aOffset <= mSize); + + return mData + aOffset; + } + + void SetRange(size_t aOffset, size_t aSize) + { + MOZ_ASSERT((aOffset + aSize) <= mAvailableSpace); + + mOffset = aOffset; + mSize = mOffset + aSize; + } + + void CleanupLeadingSpace(); + +private: + size_t mSize; + size_t mOffset; + size_t mAvailableSpace; + nsAutoArrayPtr mData; +}; + // // UnixSocketRawData // -class UnixSocketRawData +class UnixSocketRawData MOZ_FINAL : public UnixSocketIOBuffer { public: /* This constructor copies aData of aSize bytes length into the @@ -51,51 +193,6 @@ public: * is the number of bytes written, or a negative value on error. */ ssize_t Send(int aFd); - - const uint8_t* GetData() const - { - return mData + mOffset; - } - - size_t GetSize() const - { - return mSize; - } - - void Consume(size_t aSize) - { - MOZ_ASSERT(aSize <= mSize); - - mSize -= aSize; - mOffset += aSize; - } - -protected: - size_t GetLeadingSpace() const - { - return mOffset; - } - - size_t GetTrailingSpace() const - { - return mAvailableSpace - (mOffset + mSize); - } - - size_t GetAvailableSpace() const - { - return mAvailableSpace; - } - - void* GetTrailingBytes() - { - return mData + mOffset + mSize; - } - -private: - size_t mSize; - size_t mOffset; - size_t mAvailableSpace; - nsAutoArrayPtr mData; }; enum SocketConnectionStatus { From 9f7d48d31aada3d7c5e735d6f73d838d09086c1e Mon Sep 17 00:00:00 2001 From: "Szu-Yu Chen [:aknow]" Date: Mon, 20 Oct 2014 03:11:00 +0200 Subject: [PATCH 10/70] Bug 978639 - Part 1: Add hangUp method (webidl). r=hsinyi --- dom/webidl/TelephonyCallGroup.webidl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dom/webidl/TelephonyCallGroup.webidl b/dom/webidl/TelephonyCallGroup.webidl index 563594b2c11a..f3539b5b2d81 100644 --- a/dom/webidl/TelephonyCallGroup.webidl +++ b/dom/webidl/TelephonyCallGroup.webidl @@ -17,6 +17,9 @@ interface TelephonyCallGroup : EventTarget { [Throws] void remove(TelephonyCall call); + [NewObject, Throws] + Promise hangUp(); + [Throws] void hold(); From d05c5424123558171cd45362abe3f28765f673f6 Mon Sep 17 00:00:00 2001 From: "Szu-Yu Chen [:aknow]" Date: Mon, 20 Oct 2014 03:12:00 +0200 Subject: [PATCH 11/70] Bug 978639 - Part 2: Add hangUp method (dom). r=hsinyi --- dom/telephony/TelephonyCallGroup.cpp | 22 ++++++++++++++++++++++ dom/telephony/TelephonyCallGroup.h | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/dom/telephony/TelephonyCallGroup.cpp b/dom/telephony/TelephonyCallGroup.cpp index 4c1afc326f63..318af9ae2f0c 100644 --- a/dom/telephony/TelephonyCallGroup.cpp +++ b/dom/telephony/TelephonyCallGroup.cpp @@ -277,6 +277,28 @@ TelephonyCallGroup::Remove(TelephonyCall& aCall, ErrorResult& aRv) } } +already_AddRefed +TelephonyCallGroup::HangUp(ErrorResult& aRv) +{ + MOZ_ASSERT(!mCalls.IsEmpty()); + + nsCOMPtr global = do_QueryInterface(GetOwner()); + if (!global) { + aRv.Throw(NS_ERROR_FAILURE); + return nullptr; + } + + nsRefPtr promise = Promise::Create(global, aRv); + NS_ENSURE_TRUE(!aRv.Failed(), nullptr); + + nsCOMPtr callback = new TelephonyCallback(promise); + aRv = mTelephony->Service()->HangUpConference(mCalls[0]->ServiceId(), + callback); + NS_ENSURE_TRUE(!aRv.Failed(), nullptr); + + return promise.forget(); +} + void TelephonyCallGroup::Hold(ErrorResult& aRv) { diff --git a/dom/telephony/TelephonyCallGroup.h b/dom/telephony/TelephonyCallGroup.h index 47981ee6b6bf..91e1eae8996f 100644 --- a/dom/telephony/TelephonyCallGroup.h +++ b/dom/telephony/TelephonyCallGroup.h @@ -7,6 +7,7 @@ #ifndef mozilla_dom_telephony_telephonycallgroup_h__ #define mozilla_dom_telephony_telephonycallgroup_h__ +#include "mozilla/dom/Promise.h" #include "mozilla/dom/telephony/TelephonyCommon.h" namespace mozilla { @@ -52,6 +53,9 @@ public: void Remove(TelephonyCall& aCall, ErrorResult& aRv); + already_AddRefed + HangUp(ErrorResult& aRv); + void Hold(ErrorResult& aRv); From 83fa4d8a67f015f3a4b706328413595198b8ea91 Mon Sep 17 00:00:00 2001 From: "Szu-Yu Chen [:aknow]" Date: Mon, 20 Oct 2014 03:12:00 +0200 Subject: [PATCH 12/70] Bug 978639 - Part 3: Add hangUpConference method (internal interface). r=hsinyi --- dom/telephony/nsITelephonyService.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dom/telephony/nsITelephonyService.idl b/dom/telephony/nsITelephonyService.idl index 56872631ebd4..5867af321f2c 100644 --- a/dom/telephony/nsITelephonyService.idl +++ b/dom/telephony/nsITelephonyService.idl @@ -240,7 +240,7 @@ interface nsITelephonyDialCallback : nsITelephonyCallback * XPCOM component (in the content process) that provides the telephony * information. */ -[scriptable, uuid(79188caa-046a-48e1-b9c5-2e891504dc7a)] +[scriptable, uuid(6fa2d94b-80ee-4085-b6a0-535811ba9bb6)] interface nsITelephonyService : nsISupports { const unsigned short CALL_STATE_UNKNOWN = 0; @@ -296,6 +296,8 @@ interface nsITelephonyService : nsISupports void conferenceCall(in unsigned long clientId); void separateCall(in unsigned long clientId, in unsigned long callIndex); + void hangUpConference(in unsigned long clientId, + in nsITelephonyCallback callback); void holdConference(in unsigned long clientId); void resumeConference(in unsigned long clientId); From 3784c043526cf312ecaab5a6aab32bf43207430f Mon Sep 17 00:00:00 2001 From: "Szu-Yu Chen [:aknow]" Date: Mon, 20 Oct 2014 03:12:00 +0200 Subject: [PATCH 13/70] Bug 978639 - Part 4: Add hangUpConference method (ipc). r=hsinyi --- dom/telephony/ipc/PTelephony.ipdl | 6 ++++++ dom/telephony/ipc/TelephonyIPCService.cpp | 7 +++++++ dom/telephony/ipc/TelephonyParent.cpp | 16 ++++++++++++++++ dom/telephony/ipc/TelephonyParent.h | 3 +++ 4 files changed, 32 insertions(+) diff --git a/dom/telephony/ipc/PTelephony.ipdl b/dom/telephony/ipc/PTelephony.ipdl index 229525b58946..25c9a4d43afc 100644 --- a/dom/telephony/ipc/PTelephony.ipdl +++ b/dom/telephony/ipc/PTelephony.ipdl @@ -30,11 +30,17 @@ struct USSDRequest nsString ussd; }; +struct HangUpConferenceRequest +{ + uint32_t clientId; +}; + union IPCTelephonyRequest { EnumerateCallsRequest; DialRequest; USSDRequest; + HangUpConferenceRequest; }; sync protocol PTelephony { diff --git a/dom/telephony/ipc/TelephonyIPCService.cpp b/dom/telephony/ipc/TelephonyIPCService.cpp index 1d31ae5c7433..a2cec3994e80 100644 --- a/dom/telephony/ipc/TelephonyIPCService.cpp +++ b/dom/telephony/ipc/TelephonyIPCService.cpp @@ -253,6 +253,13 @@ TelephonyIPCService::SeparateCall(uint32_t aClientId, uint32_t aCallIndex) return NS_OK; } +NS_IMETHODIMP +TelephonyIPCService::HangUpConference(uint32_t aClientId, + nsITelephonyCallback *aCallback) +{ + return SendRequest(nullptr, aCallback, HangUpConferenceRequest(aClientId)); +} + NS_IMETHODIMP TelephonyIPCService::HoldConference(uint32_t aClientId) { diff --git a/dom/telephony/ipc/TelephonyParent.cpp b/dom/telephony/ipc/TelephonyParent.cpp index 4cb5fe4714a6..309a27c82e6d 100644 --- a/dom/telephony/ipc/TelephonyParent.cpp +++ b/dom/telephony/ipc/TelephonyParent.cpp @@ -45,6 +45,8 @@ TelephonyParent::RecvPTelephonyRequestConstructor(PTelephonyRequestParent* aActo return actor->DoRequest(aRequest.get_DialRequest()); case IPCTelephonyRequest::TUSSDRequest: return actor->DoRequest(aRequest.get_USSDRequest()); + case IPCTelephonyRequest::THangUpConferenceRequest: + return actor->DoRequest(aRequest.get_HangUpConferenceRequest()); default: MOZ_CRASH("Unknown type!"); } @@ -451,6 +453,20 @@ TelephonyRequestParent::DoRequest(const USSDRequest& aRequest) return true; } +bool +TelephonyRequestParent::DoRequest(const HangUpConferenceRequest& aRequest) +{ + nsCOMPtr service = + do_GetService(TELEPHONY_SERVICE_CONTRACTID); + if (service) { + service->HangUpConference(aRequest.clientId(), this); + } else { + return NS_SUCCEEDED(NotifyError(NS_LITERAL_STRING("InvalidStateError"))); + } + + return true; +} + nsresult TelephonyRequestParent::SendResponse(const IPCTelephonyResponse& aResponse) { diff --git a/dom/telephony/ipc/TelephonyParent.h b/dom/telephony/ipc/TelephonyParent.h index e88710e092d1..cfaec304ff57 100644 --- a/dom/telephony/ipc/TelephonyParent.h +++ b/dom/telephony/ipc/TelephonyParent.h @@ -129,6 +129,9 @@ private: bool DoRequest(const USSDRequest& aRequest); + + bool + DoRequest(const HangUpConferenceRequest& aRequest); }; END_TELEPHONY_NAMESPACE From 52c16420c50bf0647ddb0be815f1ee7da7708326 Mon Sep 17 00:00:00 2001 From: "Szu-Yu Chen [:aknow]" Date: Mon, 20 Oct 2014 03:13:00 +0200 Subject: [PATCH 14/70] Bug 978639 - Part 5: Add hangUpConference method (ril). r=hsinyi --- dom/system/gonk/ril_worker.js | 67 ++++++++++++++++++-------- dom/telephony/gonk/TelephonyService.js | 10 ++++ 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 0c6fb69e5c2d..57b82cd4dbd9 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -215,6 +215,7 @@ const TELEPHONY_REQUESTS = [ REQUEST_DIAL, REQUEST_DIAL_EMERGENCY_CALL, REQUEST_HANGUP, + REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, REQUEST_HANGUP_WAITING_OR_BACKGROUND, REQUEST_SEPARATE_CONNECTION, REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE, @@ -1779,13 +1780,25 @@ RilObject.prototype = { Buf.sendParcel(); }, - sendHangUpBackgroundRequest: function() { - this.telephonyRequestQueue.push(REQUEST_HANGUP_WAITING_OR_BACKGROUND, - this.sendRilRequestHangUpWaiting, null); + sendHangUpForegroundRequest: function(options) { + this.telephonyRequestQueue.push(REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, + this.sendRilRequestHangUpForeground, + options); }, - sendRilRequestHangUpWaiting: function() { - this.context.Buf.simpleRequest(REQUEST_HANGUP_WAITING_OR_BACKGROUND); + sendRilRequestHangUpForeground: function(options) { + this.context.Buf.simpleRequest(REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, + options); + }, + + sendHangUpBackgroundRequest: function(options) { + this.telephonyRequestQueue.push(REQUEST_HANGUP_WAITING_OR_BACKGROUND, + this.sendRilRequestHangUpWaiting, options); + }, + + sendRilRequestHangUpWaiting: function(options) { + this.context.Buf.simpleRequest(REQUEST_HANGUP_WAITING_OR_BACKGROUND, + options); }, /** @@ -1974,6 +1987,27 @@ RilObject.prototype = { Buf.sendParcel(); }, + hangUpConference: function(options) { + if (this._isCdma) { + // In cdma, ril only maintains one call index. + let call = this.currentCalls[1]; + if (!call) { + options.success = false; + options.errorMsg = GECKO_ERROR_GENERIC_FAILURE; + this.sendChromeMessage(options); + return; + } + call.hangUpLocal = true; + this.sendHangUpRequest(1); + } else { + if (this.currentConference.state === CALL_STATE_ACTIVE) { + this.sendHangUpForegroundRequest(options); + } else { + this.sendHangUpBackgroundRequest(options); + } + } + }, + holdConference: function() { if (this._isCdma) { return; @@ -5497,26 +5531,19 @@ RilObject.prototype[REQUEST_GET_IMSI] = function REQUEST_GET_IMSI(length, option this.sendChromeMessage(options); }; RilObject.prototype[REQUEST_HANGUP] = function REQUEST_HANGUP(length, options) { - if (options.rilRequestError) { - return; - } + options.success = options.rilRequestError === 0; + options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError]; + this.sendChromeMessage(options); - this.getCurrentCalls(); + if (options.success) { + this.getCurrentCalls(); + } }; RilObject.prototype[REQUEST_HANGUP_WAITING_OR_BACKGROUND] = function REQUEST_HANGUP_WAITING_OR_BACKGROUND(length, options) { - if (options.rilRequestError) { - return; - } - - this.getCurrentCalls(); + RilObject.prototype[REQUEST_HANGUP].call(this, length, options); }; -// TODO Bug 1012599: This one is not used. RilObject.prototype[REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND] = function REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND(length, options) { - if (options.rilRequestError) { - return; - } - - this.getCurrentCalls(); + RilObject.prototype[REQUEST_HANGUP].call(this, length, options); }; RilObject.prototype[REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE] = function REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE(length, options) { if (options.rilRequestError) { diff --git a/dom/telephony/gonk/TelephonyService.js b/dom/telephony/gonk/TelephonyService.js index 463ec25f9e87..d732af86ff0e 100644 --- a/dom/telephony/gonk/TelephonyService.js +++ b/dom/telephony/gonk/TelephonyService.js @@ -1038,6 +1038,16 @@ TelephonyService.prototype = { }); }, + hangUpConference: function(aClientId, aCallback) { + this._sendToRilWorker(aClientId, "hangUpConference", null, response => { + if (!response.success) { + aCallback.notifyError(response.errorMsg); + } else { + aCallback.notifySuccess(); + } + }); + }, + holdConference: function(aClientId) { this._sendToRilWorker(aClientId, "holdConference"); }, From 907dfe97131a7105cd28a5ffb8697be9da6fb474 Mon Sep 17 00:00:00 2001 From: "Szu-Yu Chen [:aknow]" Date: Mon, 20 Oct 2014 03:13:00 +0200 Subject: [PATCH 15/70] Bug 978639 - Part 6: Add test case. r=hsinyi --- dom/telephony/test/marionette/head.js | 39 +++++++++++++ dom/telephony/test/marionette/manifest.ini | 1 + .../test_conference_two_hangup_all.js | 56 +++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 dom/telephony/test/marionette/test_conference_two_hangup_all.js diff --git a/dom/telephony/test/marionette/head.js b/dom/telephony/test/marionette/head.js index 4eb1a994147e..736f2ec7c068 100644 --- a/dom/telephony/test/marionette/head.js +++ b/dom/telephony/test/marionette/head.js @@ -1101,6 +1101,44 @@ let emulator = (function() { return deferred.promise; } + /** + * Hangup conference. + * + * @return A deferred promise. + */ + function hangUpConference() { + log("Hangup conference."); + + let deferred = Promise.defer(); + let done = function() { + deferred.resolve(); + }; + + let pending = ["conference.hangUp", "conference.onstatechange"]; + let receive = function(name) { + receivedPending(name, pending, done); + }; + + for (let call of conference.calls) { + let callName = "Call (" + call.id.number + ')'; + + let onstatechange = callName + ".onstatechange"; + pending.push(onstatechange); + check_onstatechange(call, callName, 'disconnected', + receive.bind(null, onstatechange)); + } + + check_onstatechange(conference, 'conference', '', function() { + receive("conference.onstatechange"); + }); + + conference.hangUp().then(() => { + receive("conference.hangUp"); + }); + + return deferred.promise; + } + /** * Create a conference with an outgoing call and an incoming call. * @@ -1245,6 +1283,7 @@ let emulator = (function() { this.gResumeConference = resumeConference; this.gRemoveCallInConference = removeCallInConference; this.gHangUpCallInConference = hangUpCallInConference; + this.gHangUpConference = hangUpConference; this.gSetupConference = setupConference; this.gReceivedPending = receivedPending; }()); diff --git a/dom/telephony/test/marionette/manifest.ini b/dom/telephony/test/marionette/manifest.ini index c696383e4c1c..626671062342 100644 --- a/dom/telephony/test/marionette/manifest.ini +++ b/dom/telephony/test/marionette/manifest.ini @@ -52,6 +52,7 @@ disabled = Bug 821958 [test_conference_two_calls.js] [test_conference_add_error.js] [test_conference_remove_error.js] +[test_conference_two_hangup_all.js] [test_conference_two_hangup_one.js] [test_conference_two_hold_resume.js] [test_conference_two_remove_one.js] diff --git a/dom/telephony/test/marionette/test_conference_two_hangup_all.js b/dom/telephony/test/marionette/test_conference_two_hangup_all.js new file mode 100644 index 000000000000..72c2cad569e2 --- /dev/null +++ b/dom/telephony/test/marionette/test_conference_two_hangup_all.js @@ -0,0 +1,56 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = 'head.js'; + +function testConferenceHangUpForeground() { + log('= testConferenceHangUpForeground ='); + + let outCall; + let inCall; + let outNumber = "5555550101"; + let inNumber = "5555550201"; + + return Promise.resolve() + .then(() => gSetupConference([outNumber, inNumber])) + .then(calls => { + [outCall, inCall] = calls; + }) + .then(() => gHangUpConference()) + .then(() => gCheckAll(null, [], '', [], [])); +} + +function testConferenceHangUpBackground() { + log('= testConferenceHangUpBackground ='); + + let outCall; + let inCall; + let outNumber = "5555550101"; + let inNumber = "5555550201"; + let outInfo = gOutCallStrPool(outNumber); + let inInfo = gInCallStrPool(inNumber); + + return Promise.resolve() + .then(() => gSetupConference([outNumber, inNumber])) + .then(calls => { + [outCall, inCall] = calls; + }) + .then(() => gHoldConference([outCall, inCall], function() { + gCheckState(null, [], 'held', [outCall, inCall]); + })) + .then(() => gCheckAll(null, [], 'held', [outCall, inCall], + [outInfo.held, inInfo.held])) + .then(() => gHangUpConference()) + .then(() => gCheckAll(null, [], '', [], [])); +} + +// Start the test +startTest(function() { + testConferenceHangUpForeground() + .then(() => testConferenceHangUpBackground()) + .then(null, error => { + ok(false, 'promise rejects during test.'); + }) + .then(finish); +}); From 01c090f8416c7d58bbe3614d506c0cab7addc02a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 02:25:49 -0700 Subject: [PATCH 16/70] Bumping gaia.json for 8 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/db447ed53ecb Author: Carsten Book Desc: Merge pull request #25017 from mancas/bug1080253 Bug 1080253 - notification count is wrong. r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/e33185741be9 Author: Manuel Casas Barrado Desc: Bug 1080253 - notification count is wrong.r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/9e9806a853ae Author: Carsten Book Desc: Merge pull request #24949 from ochameau/fixDownload Bug 1079138 - Fix addon download by using nsIDownloader. r=gduan ======== https://hg.mozilla.org/integration/gaia-central/rev/7a1a9a303246 Author: Alexandre Poirot Desc: Bug 1079138 - Fix addon download by using nsIDownloader. r=gduan ======== https://hg.mozilla.org/integration/gaia-central/rev/2b2fd3d8bc0e Author: Carsten Book Desc: Merge pull request #24945 from ochameau/bug1074200 Bug 1074200 - Ensure that build fails when an exception happens. r=gduan ======== https://hg.mozilla.org/integration/gaia-central/rev/7ddaa09c1948 Author: Alexandre Poirot Desc: Bug 1074200 - Ensure that build fails when an exception happens. r=gduan ======== https://hg.mozilla.org/integration/gaia-central/rev/35e06f3a6f58 Author: Carsten Book Desc: Merge pull request #24672 from sv99/1070681 Bug 1070681 - [communications] unit test refactoring for new version chai.assert api (rebased). r=francisco ======== https://hg.mozilla.org/integration/gaia-central/rev/3343d67f46fb Author: sv99 Desc: Bug 1070681 - [communications] unit test refactoring for new version chai.assert api --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e8fac508e027..4a11058ac940 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "325f3c80109172bae42d00d39b117bdb7416c902", + "revision": "db447ed53ecb6235c21fe11736d20c1b129d9b8f", "repo_path": "/integration/gaia-central" } From 1daac7f88f7820f52d7c33d529f28661e3a71758 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 02:31:59 -0700 Subject: [PATCH 17/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 05ef5434c1c3..965ec45c677f 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c20483ba4bec..10ac7a6d22be 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index b6cb0a098b9c..d635b371bc79 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7e11555ee2fe..5f4bbe677102 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c20483ba4bec..10ac7a6d22be 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index c0b08ef4af7c..321b61870f61 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 483214e2aab0..e02e6e633228 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 742e9c1575c5..5a30e55c4693 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 2bfb629cc975..6e18d3dfef9b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index f4e259c06808..406ddd9530af 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index c3356f2b61cf..df84826b6614 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7a48446846f04a13cba9f7828c7e00ca3a75eef8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 02:40:48 -0700 Subject: [PATCH 18/70] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a9284b9920ee Author: Carsten Book Desc: Merge pull request #25221 from kumarrishav/Bug-1082908 Bug 1082908 - Background color of contact list should be other than white so that it differ from empty space. r=felash ======== https://hg.mozilla.org/integration/gaia-central/rev/a63240aa6fae Author: kumarrishav Desc: Bug 1082908 - Background color of contact list should be other than white so that it differ from empty space. r=julienw --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4a11058ac940..01a72b30ff64 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "db447ed53ecb6235c21fe11736d20c1b129d9b8f", + "revision": "a9284b9920ee8669558c459972ae07ae553046ef", "repo_path": "/integration/gaia-central" } From 8d861c8a03c7532903178fafd8abc8e7f25a40bd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 02:47:06 -0700 Subject: [PATCH 19/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 965ec45c677f..11be63a8b77a 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 10ac7a6d22be..4bf31f48041d 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d635b371bc79..2be661219868 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 5f4bbe677102..a27e7655865c 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 10ac7a6d22be..4bf31f48041d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 321b61870f61..ac8b9e04235c 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index e02e6e633228..60df50425087 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 5a30e55c4693..71c87662c9af 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 6e18d3dfef9b..b6a3a46a43cc 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 406ddd9530af..37e212cd4ec7 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index df84826b6614..47544aba5ace 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 9e7fc148633bf53fcc615758fc41a934643bd030 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 21 Oct 2014 11:50:52 +0200 Subject: [PATCH 20/70] Backed out changeset 0964acec6851 (bug 978639) --- dom/telephony/test/marionette/head.js | 39 ------------- dom/telephony/test/marionette/manifest.ini | 1 - .../test_conference_two_hangup_all.js | 56 ------------------- 3 files changed, 96 deletions(-) delete mode 100644 dom/telephony/test/marionette/test_conference_two_hangup_all.js diff --git a/dom/telephony/test/marionette/head.js b/dom/telephony/test/marionette/head.js index 736f2ec7c068..4eb1a994147e 100644 --- a/dom/telephony/test/marionette/head.js +++ b/dom/telephony/test/marionette/head.js @@ -1101,44 +1101,6 @@ let emulator = (function() { return deferred.promise; } - /** - * Hangup conference. - * - * @return A deferred promise. - */ - function hangUpConference() { - log("Hangup conference."); - - let deferred = Promise.defer(); - let done = function() { - deferred.resolve(); - }; - - let pending = ["conference.hangUp", "conference.onstatechange"]; - let receive = function(name) { - receivedPending(name, pending, done); - }; - - for (let call of conference.calls) { - let callName = "Call (" + call.id.number + ')'; - - let onstatechange = callName + ".onstatechange"; - pending.push(onstatechange); - check_onstatechange(call, callName, 'disconnected', - receive.bind(null, onstatechange)); - } - - check_onstatechange(conference, 'conference', '', function() { - receive("conference.onstatechange"); - }); - - conference.hangUp().then(() => { - receive("conference.hangUp"); - }); - - return deferred.promise; - } - /** * Create a conference with an outgoing call and an incoming call. * @@ -1283,7 +1245,6 @@ let emulator = (function() { this.gResumeConference = resumeConference; this.gRemoveCallInConference = removeCallInConference; this.gHangUpCallInConference = hangUpCallInConference; - this.gHangUpConference = hangUpConference; this.gSetupConference = setupConference; this.gReceivedPending = receivedPending; }()); diff --git a/dom/telephony/test/marionette/manifest.ini b/dom/telephony/test/marionette/manifest.ini index 626671062342..c696383e4c1c 100644 --- a/dom/telephony/test/marionette/manifest.ini +++ b/dom/telephony/test/marionette/manifest.ini @@ -52,7 +52,6 @@ disabled = Bug 821958 [test_conference_two_calls.js] [test_conference_add_error.js] [test_conference_remove_error.js] -[test_conference_two_hangup_all.js] [test_conference_two_hangup_one.js] [test_conference_two_hold_resume.js] [test_conference_two_remove_one.js] diff --git a/dom/telephony/test/marionette/test_conference_two_hangup_all.js b/dom/telephony/test/marionette/test_conference_two_hangup_all.js deleted file mode 100644 index 72c2cad569e2..000000000000 --- a/dom/telephony/test/marionette/test_conference_two_hangup_all.js +++ /dev/null @@ -1,56 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -MARIONETTE_TIMEOUT = 60000; -MARIONETTE_HEAD_JS = 'head.js'; - -function testConferenceHangUpForeground() { - log('= testConferenceHangUpForeground ='); - - let outCall; - let inCall; - let outNumber = "5555550101"; - let inNumber = "5555550201"; - - return Promise.resolve() - .then(() => gSetupConference([outNumber, inNumber])) - .then(calls => { - [outCall, inCall] = calls; - }) - .then(() => gHangUpConference()) - .then(() => gCheckAll(null, [], '', [], [])); -} - -function testConferenceHangUpBackground() { - log('= testConferenceHangUpBackground ='); - - let outCall; - let inCall; - let outNumber = "5555550101"; - let inNumber = "5555550201"; - let outInfo = gOutCallStrPool(outNumber); - let inInfo = gInCallStrPool(inNumber); - - return Promise.resolve() - .then(() => gSetupConference([outNumber, inNumber])) - .then(calls => { - [outCall, inCall] = calls; - }) - .then(() => gHoldConference([outCall, inCall], function() { - gCheckState(null, [], 'held', [outCall, inCall]); - })) - .then(() => gCheckAll(null, [], 'held', [outCall, inCall], - [outInfo.held, inInfo.held])) - .then(() => gHangUpConference()) - .then(() => gCheckAll(null, [], '', [], [])); -} - -// Start the test -startTest(function() { - testConferenceHangUpForeground() - .then(() => testConferenceHangUpBackground()) - .then(null, error => { - ok(false, 'promise rejects during test.'); - }) - .then(finish); -}); From 35367e534a5fea3811048f6ba89f904f848c1b51 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 21 Oct 2014 11:51:04 +0200 Subject: [PATCH 21/70] Backed out changeset d4a7883e0e92 (bug 978639) --- dom/system/gonk/ril_worker.js | 65 ++++++++------------------ dom/telephony/gonk/TelephonyService.js | 10 ---- 2 files changed, 19 insertions(+), 56 deletions(-) diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 57b82cd4dbd9..0c6fb69e5c2d 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -215,7 +215,6 @@ const TELEPHONY_REQUESTS = [ REQUEST_DIAL, REQUEST_DIAL_EMERGENCY_CALL, REQUEST_HANGUP, - REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, REQUEST_HANGUP_WAITING_OR_BACKGROUND, REQUEST_SEPARATE_CONNECTION, REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE, @@ -1780,25 +1779,13 @@ RilObject.prototype = { Buf.sendParcel(); }, - sendHangUpForegroundRequest: function(options) { - this.telephonyRequestQueue.push(REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, - this.sendRilRequestHangUpForeground, - options); - }, - - sendRilRequestHangUpForeground: function(options) { - this.context.Buf.simpleRequest(REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, - options); - }, - - sendHangUpBackgroundRequest: function(options) { + sendHangUpBackgroundRequest: function() { this.telephonyRequestQueue.push(REQUEST_HANGUP_WAITING_OR_BACKGROUND, - this.sendRilRequestHangUpWaiting, options); + this.sendRilRequestHangUpWaiting, null); }, - sendRilRequestHangUpWaiting: function(options) { - this.context.Buf.simpleRequest(REQUEST_HANGUP_WAITING_OR_BACKGROUND, - options); + sendRilRequestHangUpWaiting: function() { + this.context.Buf.simpleRequest(REQUEST_HANGUP_WAITING_OR_BACKGROUND); }, /** @@ -1987,27 +1974,6 @@ RilObject.prototype = { Buf.sendParcel(); }, - hangUpConference: function(options) { - if (this._isCdma) { - // In cdma, ril only maintains one call index. - let call = this.currentCalls[1]; - if (!call) { - options.success = false; - options.errorMsg = GECKO_ERROR_GENERIC_FAILURE; - this.sendChromeMessage(options); - return; - } - call.hangUpLocal = true; - this.sendHangUpRequest(1); - } else { - if (this.currentConference.state === CALL_STATE_ACTIVE) { - this.sendHangUpForegroundRequest(options); - } else { - this.sendHangUpBackgroundRequest(options); - } - } - }, - holdConference: function() { if (this._isCdma) { return; @@ -5531,19 +5497,26 @@ RilObject.prototype[REQUEST_GET_IMSI] = function REQUEST_GET_IMSI(length, option this.sendChromeMessage(options); }; RilObject.prototype[REQUEST_HANGUP] = function REQUEST_HANGUP(length, options) { - options.success = options.rilRequestError === 0; - options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError]; - this.sendChromeMessage(options); - - if (options.success) { - this.getCurrentCalls(); + if (options.rilRequestError) { + return; } + + this.getCurrentCalls(); }; RilObject.prototype[REQUEST_HANGUP_WAITING_OR_BACKGROUND] = function REQUEST_HANGUP_WAITING_OR_BACKGROUND(length, options) { - RilObject.prototype[REQUEST_HANGUP].call(this, length, options); + if (options.rilRequestError) { + return; + } + + this.getCurrentCalls(); }; +// TODO Bug 1012599: This one is not used. RilObject.prototype[REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND] = function REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND(length, options) { - RilObject.prototype[REQUEST_HANGUP].call(this, length, options); + if (options.rilRequestError) { + return; + } + + this.getCurrentCalls(); }; RilObject.prototype[REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE] = function REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE(length, options) { if (options.rilRequestError) { diff --git a/dom/telephony/gonk/TelephonyService.js b/dom/telephony/gonk/TelephonyService.js index d732af86ff0e..463ec25f9e87 100644 --- a/dom/telephony/gonk/TelephonyService.js +++ b/dom/telephony/gonk/TelephonyService.js @@ -1038,16 +1038,6 @@ TelephonyService.prototype = { }); }, - hangUpConference: function(aClientId, aCallback) { - this._sendToRilWorker(aClientId, "hangUpConference", null, response => { - if (!response.success) { - aCallback.notifyError(response.errorMsg); - } else { - aCallback.notifySuccess(); - } - }); - }, - holdConference: function(aClientId) { this._sendToRilWorker(aClientId, "holdConference"); }, From ea4c3a54f22ad50acdc2e218caeefff89f3d0cbc Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 21 Oct 2014 11:51:07 +0200 Subject: [PATCH 22/70] Backed out changeset b20c4afb0c7e (bug 978639) --- dom/telephony/ipc/PTelephony.ipdl | 6 ------ dom/telephony/ipc/TelephonyIPCService.cpp | 7 ------- dom/telephony/ipc/TelephonyParent.cpp | 16 ---------------- dom/telephony/ipc/TelephonyParent.h | 3 --- 4 files changed, 32 deletions(-) diff --git a/dom/telephony/ipc/PTelephony.ipdl b/dom/telephony/ipc/PTelephony.ipdl index 25c9a4d43afc..229525b58946 100644 --- a/dom/telephony/ipc/PTelephony.ipdl +++ b/dom/telephony/ipc/PTelephony.ipdl @@ -30,17 +30,11 @@ struct USSDRequest nsString ussd; }; -struct HangUpConferenceRequest -{ - uint32_t clientId; -}; - union IPCTelephonyRequest { EnumerateCallsRequest; DialRequest; USSDRequest; - HangUpConferenceRequest; }; sync protocol PTelephony { diff --git a/dom/telephony/ipc/TelephonyIPCService.cpp b/dom/telephony/ipc/TelephonyIPCService.cpp index a2cec3994e80..1d31ae5c7433 100644 --- a/dom/telephony/ipc/TelephonyIPCService.cpp +++ b/dom/telephony/ipc/TelephonyIPCService.cpp @@ -253,13 +253,6 @@ TelephonyIPCService::SeparateCall(uint32_t aClientId, uint32_t aCallIndex) return NS_OK; } -NS_IMETHODIMP -TelephonyIPCService::HangUpConference(uint32_t aClientId, - nsITelephonyCallback *aCallback) -{ - return SendRequest(nullptr, aCallback, HangUpConferenceRequest(aClientId)); -} - NS_IMETHODIMP TelephonyIPCService::HoldConference(uint32_t aClientId) { diff --git a/dom/telephony/ipc/TelephonyParent.cpp b/dom/telephony/ipc/TelephonyParent.cpp index 309a27c82e6d..4cb5fe4714a6 100644 --- a/dom/telephony/ipc/TelephonyParent.cpp +++ b/dom/telephony/ipc/TelephonyParent.cpp @@ -45,8 +45,6 @@ TelephonyParent::RecvPTelephonyRequestConstructor(PTelephonyRequestParent* aActo return actor->DoRequest(aRequest.get_DialRequest()); case IPCTelephonyRequest::TUSSDRequest: return actor->DoRequest(aRequest.get_USSDRequest()); - case IPCTelephonyRequest::THangUpConferenceRequest: - return actor->DoRequest(aRequest.get_HangUpConferenceRequest()); default: MOZ_CRASH("Unknown type!"); } @@ -453,20 +451,6 @@ TelephonyRequestParent::DoRequest(const USSDRequest& aRequest) return true; } -bool -TelephonyRequestParent::DoRequest(const HangUpConferenceRequest& aRequest) -{ - nsCOMPtr service = - do_GetService(TELEPHONY_SERVICE_CONTRACTID); - if (service) { - service->HangUpConference(aRequest.clientId(), this); - } else { - return NS_SUCCEEDED(NotifyError(NS_LITERAL_STRING("InvalidStateError"))); - } - - return true; -} - nsresult TelephonyRequestParent::SendResponse(const IPCTelephonyResponse& aResponse) { diff --git a/dom/telephony/ipc/TelephonyParent.h b/dom/telephony/ipc/TelephonyParent.h index cfaec304ff57..e88710e092d1 100644 --- a/dom/telephony/ipc/TelephonyParent.h +++ b/dom/telephony/ipc/TelephonyParent.h @@ -129,9 +129,6 @@ private: bool DoRequest(const USSDRequest& aRequest); - - bool - DoRequest(const HangUpConferenceRequest& aRequest); }; END_TELEPHONY_NAMESPACE From 7af44b9a9b0deba07fc7725ea691e91b90383eec Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 21 Oct 2014 11:51:10 +0200 Subject: [PATCH 23/70] Backed out changeset b64604a829ff (bug 978639) --- dom/telephony/nsITelephonyService.idl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dom/telephony/nsITelephonyService.idl b/dom/telephony/nsITelephonyService.idl index 5867af321f2c..56872631ebd4 100644 --- a/dom/telephony/nsITelephonyService.idl +++ b/dom/telephony/nsITelephonyService.idl @@ -240,7 +240,7 @@ interface nsITelephonyDialCallback : nsITelephonyCallback * XPCOM component (in the content process) that provides the telephony * information. */ -[scriptable, uuid(6fa2d94b-80ee-4085-b6a0-535811ba9bb6)] +[scriptable, uuid(79188caa-046a-48e1-b9c5-2e891504dc7a)] interface nsITelephonyService : nsISupports { const unsigned short CALL_STATE_UNKNOWN = 0; @@ -296,8 +296,6 @@ interface nsITelephonyService : nsISupports void conferenceCall(in unsigned long clientId); void separateCall(in unsigned long clientId, in unsigned long callIndex); - void hangUpConference(in unsigned long clientId, - in nsITelephonyCallback callback); void holdConference(in unsigned long clientId); void resumeConference(in unsigned long clientId); From b66d34932bcb4e361e757951703b4b78ef9a1bd1 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 21 Oct 2014 11:51:12 +0200 Subject: [PATCH 24/70] Backed out changeset a5c28b69a261 (bug 978639) --- dom/telephony/TelephonyCallGroup.cpp | 22 ---------------------- dom/telephony/TelephonyCallGroup.h | 4 ---- 2 files changed, 26 deletions(-) diff --git a/dom/telephony/TelephonyCallGroup.cpp b/dom/telephony/TelephonyCallGroup.cpp index 318af9ae2f0c..4c1afc326f63 100644 --- a/dom/telephony/TelephonyCallGroup.cpp +++ b/dom/telephony/TelephonyCallGroup.cpp @@ -277,28 +277,6 @@ TelephonyCallGroup::Remove(TelephonyCall& aCall, ErrorResult& aRv) } } -already_AddRefed -TelephonyCallGroup::HangUp(ErrorResult& aRv) -{ - MOZ_ASSERT(!mCalls.IsEmpty()); - - nsCOMPtr global = do_QueryInterface(GetOwner()); - if (!global) { - aRv.Throw(NS_ERROR_FAILURE); - return nullptr; - } - - nsRefPtr promise = Promise::Create(global, aRv); - NS_ENSURE_TRUE(!aRv.Failed(), nullptr); - - nsCOMPtr callback = new TelephonyCallback(promise); - aRv = mTelephony->Service()->HangUpConference(mCalls[0]->ServiceId(), - callback); - NS_ENSURE_TRUE(!aRv.Failed(), nullptr); - - return promise.forget(); -} - void TelephonyCallGroup::Hold(ErrorResult& aRv) { diff --git a/dom/telephony/TelephonyCallGroup.h b/dom/telephony/TelephonyCallGroup.h index 91e1eae8996f..47981ee6b6bf 100644 --- a/dom/telephony/TelephonyCallGroup.h +++ b/dom/telephony/TelephonyCallGroup.h @@ -7,7 +7,6 @@ #ifndef mozilla_dom_telephony_telephonycallgroup_h__ #define mozilla_dom_telephony_telephonycallgroup_h__ -#include "mozilla/dom/Promise.h" #include "mozilla/dom/telephony/TelephonyCommon.h" namespace mozilla { @@ -53,9 +52,6 @@ public: void Remove(TelephonyCall& aCall, ErrorResult& aRv); - already_AddRefed - HangUp(ErrorResult& aRv); - void Hold(ErrorResult& aRv); From 1e4b14b396ef8403ae6c8f196c32bf561b81870f Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 21 Oct 2014 11:53:16 +0200 Subject: [PATCH 25/70] Backed out changeset 48b004974cd2 (bug 978639) for breaking non-unified builds on a CLOSED TREE --- dom/webidl/TelephonyCallGroup.webidl | 3 --- 1 file changed, 3 deletions(-) diff --git a/dom/webidl/TelephonyCallGroup.webidl b/dom/webidl/TelephonyCallGroup.webidl index f3539b5b2d81..563594b2c11a 100644 --- a/dom/webidl/TelephonyCallGroup.webidl +++ b/dom/webidl/TelephonyCallGroup.webidl @@ -17,9 +17,6 @@ interface TelephonyCallGroup : EventTarget { [Throws] void remove(TelephonyCall call); - [NewObject, Throws] - Promise hangUp(); - [Throws] void hold(); From e2968f4093bcda630497726e22b431fcf6dcdcd3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 03:10:48 -0700 Subject: [PATCH 26/70] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/68e95e070dad Author: pacorampas Desc: Merge pull request #24828 from pacorampas/1078227 Bug 1078227 - Add data-icon option in tabs BB r=arnau ======== https://hg.mozilla.org/integration/gaia-central/rev/3eecf59ac0e9 Author: Paco Rampas Desc: Bug 1078227 - Add data-icon option in tabs BB --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 01a72b30ff64..8afcf96ccf24 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "a9284b9920ee8669558c459972ae07ae553046ef", + "revision": "68e95e070dad0f3f635c2c35ad1a0ad2b9d3a4a6", "repo_path": "/integration/gaia-central" } From eb4c7dd69b3fd9d7c9b2a159643e5934986252bd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 03:17:05 -0700 Subject: [PATCH 27/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 11be63a8b77a..51e708dfc8ab 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4bf31f48041d..c33f736901ec 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 2be661219868..8758e56bb0ec 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index a27e7655865c..75ee344de535 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 4bf31f48041d..c33f736901ec 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index ac8b9e04235c..00cf329f4c35 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 60df50425087..24286bf6aac8 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 71c87662c9af..ddae04d8c9a1 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index b6a3a46a43cc..9bf01046689a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 37e212cd4ec7..c1899ee79f79 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 47544aba5ace..b57c1f0173b5 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 081b3175d817a4ca28f124cf67da163b5f07b367 Mon Sep 17 00:00:00 2001 From: Dimi Lee Date: Mon, 20 Oct 2014 18:20:07 +0800 Subject: [PATCH 28/70] Bug 1083651 - [NFC] Remove unused error code. r=allstars.chh --- dom/nfc/gonk/NfcGonkMessage.h | 2 +- dom/nfc/gonk/nfc_consts.js | 60 +++++++++++------------------------ 2 files changed, 19 insertions(+), 43 deletions(-) diff --git a/dom/nfc/gonk/NfcGonkMessage.h b/dom/nfc/gonk/NfcGonkMessage.h index 395c38d2ff40..35c7dc9265d1 100644 --- a/dom/nfc/gonk/NfcGonkMessage.h +++ b/dom/nfc/gonk/NfcGonkMessage.h @@ -8,7 +8,7 @@ namespace mozilla { #define NFCD_MAJOR_VERSION 1 -#define NFCD_MINOR_VERSION 12 +#define NFCD_MINOR_VERSION 13 enum NfcRequest { ConfigReq = 0, diff --git a/dom/nfc/gonk/nfc_consts.js b/dom/nfc/gonk/nfc_consts.js index 7341ed2f1f78..2f8abf93d96c 100644 --- a/dom/nfc/gonk/nfc_consts.js +++ b/dom/nfc/gonk/nfc_consts.js @@ -25,36 +25,24 @@ this.DEBUG_NFC = false || DEBUG_ALL; // nfcd error codes this.NFC_SUCCESS = 0; this.NFC_ERROR_IO = -1; -this.NFC_ERROR_CANCELLED = -2; -this.NFC_ERROR_TIMEOUT = -3; -this.NFC_ERROR_BUSY = -4; -this.NFC_ERROR_CONNECT = -5; -this.NFC_ERROR_DISCONNECT = -6; -this.NFC_ERROR_READ = -7; -this.NFC_ERROR_WRITE = -8; -this.NFC_ERROR_INVALID_PARAM = -9; -this.NFC_ERROR_INSUFFICIENT_RESOURCES = -10; -this.NFC_ERROR_SOCKET_CREATION = -11; -this.NFC_ERROR_SOCKET_NOT_CONNECTED = -12; -this.NFC_ERROR_BUFFER_TOO_SMALL = -13; -this.NFC_ERROR_SAP_USED = -14; -this.NFC_ERROR_SERVICE_NAME_USED = -15; -this.NFC_ERROR_SOCKET_OPTIONS = -16; -this.NFC_ERROR_FAIL_ENABLE_DISCOVERY = -17; -this.NFC_ERROR_FAIL_DISABLE_DISCOVERY = -18; -this.NFC_ERROR_NOT_INITIALIZED = -19; -this.NFC_ERROR_INITIALIZE_FAIL = -20; -this.NFC_ERROR_DEINITIALIZE_FAIL = -21; -this.NFC_ERROR_SE_CONNECTED = -22; -this.NFC_ERROR_NO_SE_CONNECTED = -23; -this.NFC_ERROR_NOT_SUPPORTED = -24; -this.NFC_ERROR_BAD_SESSION_ID = -25; -this.NFC_ERROR_LOST_TECH = -26; -this.NFC_ERROR_BAD_TECH_TYPE = -27; -this.NFC_ERROR_SELECT_SE_FAIL = -28; -this.NFC_ERROR_DESELECT_SE_FAIL = -29; -this.NFC_ERROR_FAIL_ENABLE_LOW_POWER_MODE = -30; -this.NFC_ERROR_FAIL_DISABLE_LOW_POWER_MODE = -31; +this.NFC_ERROR_TIMEOUT = -2; +this.NFC_ERROR_BUSY = -3; +this.NFC_ERROR_CONNECT = -4; +this.NFC_ERROR_DISCONNECT = -5; +this.NFC_ERROR_READ = -6; +this.NFC_ERROR_WRITE = -7; +this.NFC_ERROR_INVALID_PARAM = -8; +this.NFC_ERROR_INSUFFICIENT_RESOURCES = -9; +this.NFC_ERROR_SOCKET_CREATION = -10; +this.NFC_ERROR_FAIL_ENABLE_DISCOVERY = -11; +this.NFC_ERROR_FAIL_DISABLE_DISCOVERY = -12; +this.NFC_ERROR_NOT_INITIALIZED = -13; +this.NFC_ERROR_INITIALIZE_FAIL = -14; +this.NFC_ERROR_DEINITIALIZE_FAIL = -15; +this.NFC_ERROR_NOT_SUPPORTED = -16; +this.NFC_ERROR_BAD_SESSION_ID = -17, +this.NFC_ERROR_FAIL_ENABLE_LOW_POWER_MODE = -18; +this.NFC_ERROR_FAIL_DISABLE_LOW_POWER_MODE = -19; // Gecko specific error codes this.NFC_GECKO_ERROR_GENERIC_FAILURE = 1; @@ -64,7 +52,6 @@ this.NFC_GECKO_ERROR_SEND_FILE_FAILED = 4; this.NFC_ERROR_MSG = {}; this.NFC_ERROR_MSG[this.NFC_ERROR_IO] = "NfcIoError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_CANCELLED] = "NfcCancelledError"; this.NFC_ERROR_MSG[this.NFC_ERROR_TIMEOUT] = "NfcTimeoutError"; this.NFC_ERROR_MSG[this.NFC_ERROR_BUSY] = "NfcBusyError"; this.NFC_ERROR_MSG[this.NFC_ERROR_CONNECT] = "NfcConnectError"; @@ -74,24 +61,13 @@ this.NFC_ERROR_MSG[this.NFC_ERROR_WRITE] = "NfcWriteError"; this.NFC_ERROR_MSG[this.NFC_ERROR_INVALID_PARAM] = "NfcInvalidParamError"; this.NFC_ERROR_MSG[this.NFC_ERROR_INSUFFICIENT_RESOURCES] = "NfcInsufficentResourcesError"; this.NFC_ERROR_MSG[this.NFC_ERROR_SOCKET_CREATION] = "NfcSocketCreationError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_SOCKET_NOT_CONNECTED] = "NfcSocketNotConntectedError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_BUFFER_TOO_SMALL] = "NfcBufferTooSmallError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_SAP_USED] = "NfcSapUsedError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_SERVICE_NAME_USED] = "NfcServiceNameUsedError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_SOCKET_OPTIONS] = "NfcSocketOptionsError"; this.NFC_ERROR_MSG[this.NFC_ERROR_FAIL_ENABLE_DISCOVERY] = "NfcFailEnableDiscoveryError"; this.NFC_ERROR_MSG[this.NFC_ERROR_FAIL_DISABLE_DISCOVERY] = "NfcFailDisableDiscoveryError"; this.NFC_ERROR_MSG[this.NFC_ERROR_NOT_INITIALIZED] = "NfcNotInitializedError"; this.NFC_ERROR_MSG[this.NFC_ERROR_INITIALIZE_FAIL] = "NfcInitializeFailError"; this.NFC_ERROR_MSG[this.NFC_ERROR_DEINITIALIZE_FAIL] = "NfcDeinitializeFailError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_SE_CONNECTED] = "NfcSeConnectedError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_NO_SE_CONNECTED] = "NfcNoSeConnectedError"; this.NFC_ERROR_MSG[this.NFC_ERROR_NOT_SUPPORTED] = "NfcNotSupportedError"; this.NFC_ERROR_MSG[this.NFC_ERROR_BAD_SESSION_ID] = "NfcBadSessionIdError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_LOST_TECH] = "NfcLostTechError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_BAD_TECH_TYPE] = "NfcBadTechTypeError"; -this.NFC_ERROR_MSG[this.NFC_ERROR_SELECT_SE_FAIL] = "SelectSecureElementFailed"; -this.NFC_ERROR_MSG[this.NFC_ERROR_DESELECT_SE_FAIL] = "DeselectSecureElementFailed"; this.NFC_ERROR_MSG[this.NFC_ERROR_FAIL_ENABLE_LOW_POWER_MODE] = "EnableLowPowerModeFail"; this.NFC_ERROR_MSG[this.NFC_ERROR_FAIL_DISABLE_LOW_POWER_MODE] = "DisableLowPowerModeFail"; this.NFC_ERROR_MSG[this.NFC_GECKO_ERROR_GENERIC_FAILURE] = "NfcGenericFailureError"; From 0eb1fab48d7d3a13b33ca5b73d7167d5f30735ea Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 03:48:55 -0700 Subject: [PATCH 29/70] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9cbdc409d0fd Author: Min-Zhong "John" Lu Desc: Merge pull request #25349 from mnjul/bug_1085384_uppercase_not_correctly_retrieved Bug 1085384 - Use page.upperCase instead of layout.upperCase as the structure has been moved to page during normalization. r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/576d2eb27cf4 Author: John Lu [:mnjul] Desc: Bug 1085384 - Use page.upperCase instead of layout.upperCase as the structure has been moved to page during normalization. ======== https://hg.mozilla.org/integration/gaia-central/rev/ac6c8abc3983 Author: Dale Harvey Desc: Bug 1083197 - Dont bail when seeing places without icons. r=kgrandon --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8afcf96ccf24..2e176a09a71c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "68e95e070dad0f3f635c2c35ad1a0ad2b9d3a4a6", + "revision": "9cbdc409d0fd9ec8fa4265bcf5e7fd29542dcb89", "repo_path": "/integration/gaia-central" } From 9b8b0f34e05f8cca474d834b17fe5e216dcb8f79 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 03:49:10 -0700 Subject: [PATCH 30/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 51e708dfc8ab..74130984a1f1 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c33f736901ec..f2800988188b 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 8758e56bb0ec..99ae5ff5a179 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 75ee344de535..0f3114b054be 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c33f736901ec..f2800988188b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 00cf329f4c35..c77528676f7e 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 24286bf6aac8..8c6bc9a73e20 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index ddae04d8c9a1..1ea0a1c77e81 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9bf01046689a..ba493e41d279 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index c1899ee79f79..8a09ce5d62da 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index b57c1f0173b5..09ebd2cf020f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From bc28fdac2a36e995a62fbfbb966dacc1750c5a53 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 03:52:32 -0700 Subject: [PATCH 31/70] Bumping manifests a=b2g-bump --- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 99ae5ff5a179..4a1e3ecf92b6 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -134,7 +134,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index c77528676f7e..0ebcb005c759 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -151,7 +151,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 8c6bc9a73e20..b3743727882e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -145,7 +145,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 8a09ce5d62da..55b619a03fcf 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -129,7 +129,7 @@ - + From 330bacf594807a42348dcc8f2762d1641d6ec4f7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 04:25:49 -0700 Subject: [PATCH 32/70] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/a5fd868ae557 Author: Jose M. Cantera Desc: Merge pull request #24920 from ADLR-es/vcard-from-mail-prototype Bug 974589 - [contacts] Contacts needs open activity to support text/vca... ======== https://hg.mozilla.org/integration/gaia-central/rev/96b178607d66 Author: Adrián de la Rosa Desc: Bug 974589 - [contacts] Contacts needs open activity to support text/vcard because bug 887663 added it to the MimeMapper so email thinks they are downloadable ======== https://hg.mozilla.org/integration/gaia-central/rev/b372e70df4eb Author: albertopq Desc: Merge pull request #25274 from albertopq/1063305-add-tests Bug 1063305 - Add tests to NFC icon r=mhenretty ======== https://hg.mozilla.org/integration/gaia-central/rev/970866e551f6 Author: albertopq Desc: Bug 1063305 - Add tests to NFC icon --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 2e176a09a71c..adace91e61ef 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "9cbdc409d0fd9ec8fa4265bcf5e7fd29542dcb89", + "revision": "a5fd868ae5571fe6b86fc0cff74da1d3de1e2d69", "repo_path": "/integration/gaia-central" } From 0c948f1f363f24fa793153d9e18f82dcd5e5196b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 04:31:57 -0700 Subject: [PATCH 33/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 74130984a1f1..b133b12adf38 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f2800988188b..76ea37bbe568 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4a1e3ecf92b6..33bfc3c2a5b8 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 0f3114b054be..e46868bbc818 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index f2800988188b..76ea37bbe568 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 0ebcb005c759..5653341de137 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index b3743727882e..88b20e9f2814 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 1ea0a1c77e81..f85868452e92 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index ba493e41d279..94ed1d637d8c 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 55b619a03fcf..90e011ddb73b 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 09ebd2cf020f..a6e6daf46af0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 15e56f83c7d056d108c66dcf6ecb18b84010b26d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 06:10:47 -0700 Subject: [PATCH 34/70] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9eb852236e31 Author: Chris Lord Desc: Merge pull request #25339 from Cwiiis/bug1084290-drag-item-to-collapsed-group Bug 1084290 - Allow dragging an icon into a collapsed group. r=kgrandon,crdlc ======== https://hg.mozilla.org/integration/gaia-central/rev/9d8453c51591 Author: Chris Lord Desc: Bug 1084290 - Add a marionette test for dragging an icon into a collapsed group. r=crdlc,kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/5c7e87e2831b Author: Chris Lord Desc: Bug 1084290 - Allow dragging an icon into a collapsed group. r=kgrandon,crdlc --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index adace91e61ef..86ea4d6b8eb6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "a5fd868ae5571fe6b86fc0cff74da1d3de1e2d69", + "revision": "9eb852236e31102ea7f702d38a76b0e89a810201", "repo_path": "/integration/gaia-central" } From a6ef27b8f54ebeba828310088f45419d88cd76f4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 06:17:01 -0700 Subject: [PATCH 35/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index b133b12adf38..61f8fa48b577 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 76ea37bbe568..f5ac21b96083 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 33bfc3c2a5b8..d5e018562c46 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index e46868bbc818..5d2dd883d355 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 76ea37bbe568..f5ac21b96083 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 5653341de137..ccc06aa25d31 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 88b20e9f2814..3437d0419566 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f85868452e92..73d4ec19a929 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 94ed1d637d8c..d43b149d8fdc 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 90e011ddb73b..f855a3ef4532 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index a6e6daf46af0..8260858e977b 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7343057dcc049290bce391942beec56e6bc8ae71 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 06:25:50 -0700 Subject: [PATCH 36/70] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/53b9dc84593b Author: Marina Desc: Merge pull request #25358 from EdgarChen/bug_1083541/costcontrol_unknown_card_state Bug 1083541 - [Costcontrol] Showing error screen if card state is 'unknown' ======== https://hg.mozilla.org/integration/gaia-central/rev/e7b2384047ba Author: Edgar Chen Desc: Bug 1083541 - [Costcontrol] Showing error screen if card state is 'unknown'. r=mai ======== https://hg.mozilla.org/integration/gaia-central/rev/4a94baf542b8 Author: Wilson Page Desc: Merge pull request #25181 from wilsonpage/1079953 Bug 1079953 - [Lockscreen][Camera] Non-function UI in preview when camera app ======== https://hg.mozilla.org/integration/gaia-central/rev/76fe053adcc2 Author: Wilson Page Desc: Bug 1079953 - [Lockscreen][Camera] Non-function UI in preview when camera app is launched from the Lockscreen with Passcode enabled. ======== https://hg.mozilla.org/integration/gaia-central/rev/e2cffb8d00e2 Author: Wilson Page Desc: Merge pull request #25325 from wilsonpage/1085316 Bug 1085316 - Update gaia-icons ======== https://hg.mozilla.org/integration/gaia-central/rev/a910fb911c2a Author: Wilson Page Desc: Bug 1085316 - Update gaia-icons --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 86ea4d6b8eb6..9cfaf06abeab 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "9eb852236e31102ea7f702d38a76b0e89a810201", + "revision": "53b9dc84593bee4e927e44b8f6a2941f2085f207", "repo_path": "/integration/gaia-central" } From 9f4eb067ee035e60df2b3641fcc4d56630188931 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 06:36:59 -0700 Subject: [PATCH 37/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 61f8fa48b577..54ec3b4e1c22 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f5ac21b96083..99068cbcbc53 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d5e018562c46..d9238d92f72f 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 5d2dd883d355..74032ce8393e 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index f5ac21b96083..99068cbcbc53 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index ccc06aa25d31..ebc6e9c02f17 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 3437d0419566..f82ba2352028 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 73d4ec19a929..34ce1b1c4876 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index d43b149d8fdc..2f257ff31c9f 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index f855a3ef4532..3b66615ccbb5 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 8260858e977b..12b43af19df5 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c0715874a283df531b4e1f3521c8a092c3342d78 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 06:45:55 -0700 Subject: [PATCH 38/70] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/829eb1dbf811 Author: Yura Zenevich Desc: Merge pull request #25278 from yzen/bug-1069198 Bug 1069198 - fixing screen reader visibility issues between calendar vi... ======== https://hg.mozilla.org/integration/gaia-central/rev/aebe330a9116 Author: Yura Zenevich Desc: Bug 1069198 - fixing screen reader visibility issues between calendar views. r=mmedeiros ======== https://hg.mozilla.org/integration/gaia-central/rev/5c30626652b6 Author: Yura Zenevich Desc: Merge pull request #25332 from yzen/bug-1085152 Bug 1085152 - fixing an a11y calendar test for month view date selection... ======== https://hg.mozilla.org/integration/gaia-central/rev/b2b8d82e71b2 Author: Yura Zenevich Desc: Bug 1085152 - fixing an a11y calendar test for month view date selection. Ensuring that either next or previous day is selected. ======== https://hg.mozilla.org/integration/gaia-central/rev/9a02681601fd Author: Evan Tseng Desc: Merge pull request #25112 from evanxd/bug-1072779 Bug 1072779 - Show screenshot overlay when app window is hide r=alivedise ======== https://hg.mozilla.org/integration/gaia-central/rev/6ec48eed569d Author: Evan Xd Desc: Bug 1072779 - Show screenshot overlay before opening an app --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 9cfaf06abeab..e0d17129b8e6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "53b9dc84593bee4e927e44b8f6a2941f2085f207", + "revision": "829eb1dbf811717078f16c965001e174ce1961b8", "repo_path": "/integration/gaia-central" } From 2aa65140a68f183ea15cd501bbe1afd28e56da7f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 06:52:04 -0700 Subject: [PATCH 39/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 54ec3b4e1c22..2553f3f4c358 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 99068cbcbc53..8855261f055b 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d9238d92f72f..30cbf8542637 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 74032ce8393e..56beb194c396 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 99068cbcbc53..8855261f055b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index ebc6e9c02f17..55254de112ce 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index f82ba2352028..c402c64b7b1d 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 34ce1b1c4876..f881089caefd 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 2f257ff31c9f..36f0ad609735 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 3b66615ccbb5..e0b8774a8124 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 12b43af19df5..c207c1aac5b9 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From bc0681441a87264f4654c550df5251a2d36d0e86 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 07:08:50 -0700 Subject: [PATCH 40/70] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/4a4698b5efbf Author: Staś Małolepszy Desc: Merge pull request #25137 from stasm/1081040-mozL10n-cleanup Bug 1081040 - Clean up internal mozL10n API. r=gandalf ======== https://hg.mozilla.org/integration/gaia-central/rev/7c79e982c979 Author: Staś Małolepszy Desc: Bug 1081040 - Clean up internal mozL10n API. r=gandalf --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e0d17129b8e6..035db26d5439 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "829eb1dbf811717078f16c965001e174ce1961b8", + "revision": "4a4698b5efbfc72cffaa8f69a89d245966b65abe", "repo_path": "/integration/gaia-central" } From 4bc29fa3671bae757b8d6eed261c04e90b77ba73 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Oct 2014 07:09:05 -0700 Subject: [PATCH 41/70] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 2553f3f4c358..635e8c472f50 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 8855261f055b..125d18254c51 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 30cbf8542637..52a28e1309bc 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 56beb194c396..49580b6a867b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 8855261f055b..125d18254c51 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 55254de112ce..44e0cfc3992d 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index c402c64b7b1d..e66731c40f16 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f881089caefd..553a7e8fb57e 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 36f0ad609735..33a00460263b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e0b8774a8124..8629b79e424d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index c207c1aac5b9..3400aa3db6a0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 67e6833bd63e3171ce1599728ef514d751b3a080 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 21 Oct 2014 10:12:56 -0400 Subject: [PATCH 42/70] Backed out changeset 69866036d793 (bug 1076597) for being the wrong patch that landed. --- dom/settings/SettingsRequestManager.jsm | 29 +++++++------------------ 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/dom/settings/SettingsRequestManager.jsm b/dom/settings/SettingsRequestManager.jsm index 9ffcece82edb..21e7ac2028ba 100644 --- a/dom/settings/SettingsRequestManager.jsm +++ b/dom/settings/SettingsRequestManager.jsm @@ -743,33 +743,20 @@ let SettingsRequestManager = { } }, - removeMessageManager: function(aMsgMgr, aPrincipal) { + removeMessageManager: function(aMsgMgr){ if (DEBUG) debug("Removing message manager"); this.removeObserver(aMsgMgr); let closedLockIDs = []; let lockIDs = Object.keys(this.lockInfo); for (let i in lockIDs) { - let lock = this.lockInfo[lockIDs[i]]; - if (lock._mm == aMsgMgr) { - let is_finalizing = false; - for (let task_index in lock.tasks) { - if (lock.tasks[task_index].operation === "finalize") { - is_finalizing = true; - break; - } - } - if (!is_finalizing) { - this.queueTask("finalize", {lockID: lockIDs[i]}, aPrincipal).then( - function() { - if (DEBUG) debug("Lock " + lockIDs[i] + " with dead message manager finalized"); - }, - function(error) { - if (DEBUG) debug("Lock " + lockIDs[i] + " with dead message manager NOT FINALIZED due to error: " + error); - } - ); - } + if (this.lockInfo[lockIDs[i]]._mm == aMsgMgr) { + if (DEBUG) debug("Removing lock " + lockIDs[i] + " due to process close/crash"); + closedLockIDs.push(lockIDs[i]); } } + for (let i in closedLockIDs) { + this.removeLock(closedLockIDs[i]); + } }, receiveMessage: function(aMessage) { @@ -825,7 +812,7 @@ let SettingsRequestManager = { switch (aMessage.name) { case "child-process-shutdown": if (DEBUG) debug("Child process shutdown received."); - this.removeMessageManager(mm, aMessage.principal); + this.removeMessageManager(mm); break; case "Settings:RegisterForMessages": if (!SettingsPermissions.hasSomeReadPermission(aMessage.principal)) { From 2373f7c83f2a3c9255b050b169cea90d957a8f1d Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Thu, 9 Oct 2014 05:12:00 -0400 Subject: [PATCH 43/70] Bug 1076597 - Fix Settings API shutdown race condition. r=bent When child message manager dies, it sends a child-process-shutdown message to the SettingsRequestManager. This would just close the locks and tasks of this message manager. The race happens when some applications can shutdown quickly: settings requests will never be committed to the database. One example is the callscreen. The fix, provided by qDot, simply put those tasks in a finalize state to make sure they are properly executed and committed. --- dom/settings/SettingsRequestManager.jsm | 40 +++-- dom/settings/moz.build | 2 + .../test_settingsrequestmanager_messages.js | 154 ++++++++++++++++++ dom/settings/tests/unit/xpcshell.ini | 6 + 4 files changed, 192 insertions(+), 10 deletions(-) create mode 100644 dom/settings/tests/unit/test_settingsrequestmanager_messages.js create mode 100644 dom/settings/tests/unit/xpcshell.ini diff --git a/dom/settings/SettingsRequestManager.jsm b/dom/settings/SettingsRequestManager.jsm index 21e7ac2028ba..575af149ef7c 100644 --- a/dom/settings/SettingsRequestManager.jsm +++ b/dom/settings/SettingsRequestManager.jsm @@ -704,7 +704,9 @@ let SettingsRequestManager = { removeObserver: function(aMsgMgr) { if (DEBUG) { let principal = this.mmPrincipals.get(aMsgMgr); - debug("Remove observer for " + principal.origin); + if (principal) { + debug("Remove observer for " + principal.origin); + } } let index = this.children.indexOf(aMsgMgr); if (index != -1) { @@ -743,20 +745,38 @@ let SettingsRequestManager = { } }, - removeMessageManager: function(aMsgMgr){ + removeMessageManager: function(aMsgMgr, aPrincipal) { if (DEBUG) debug("Removing message manager"); + let msgMgrPrincipal = this.mmPrincipals.get(aMsgMgr); this.removeObserver(aMsgMgr); - let closedLockIDs = []; + let lockIDs = Object.keys(this.lockInfo); for (let i in lockIDs) { - if (this.lockInfo[lockIDs[i]]._mm == aMsgMgr) { - if (DEBUG) debug("Removing lock " + lockIDs[i] + " due to process close/crash"); - closedLockIDs.push(lockIDs[i]); + let lockId = lockIDs[i]; + let lock = this.lockInfo[lockId]; + if (lock._mm === aMsgMgr && msgMgrPrincipal === aPrincipal) { + let is_finalizing = false; + let task_index; + // Go in reverse order because finalize should be the last one + for (task_index = lock.tasks.length; task_index >= 0; task_index--) { + if (lock.tasks[task_index] + && lock.tasks[task_index].operation === "finalize") { + is_finalizing = true; + break; + } + } + if (!is_finalizing) { + this.queueTask("finalize", {lockID: lockId}, aPrincipal).then( + function() { + if (DEBUG) debug("Lock " + lockId + " with dead message manager finalized"); + }, + function(error) { + if (DEBUG) debug("Lock " + lockId + " with dead message manager NOT FINALIZED due to error: " + error); + } + ); + } } } - for (let i in closedLockIDs) { - this.removeLock(closedLockIDs[i]); - } }, receiveMessage: function(aMessage) { @@ -812,7 +832,7 @@ let SettingsRequestManager = { switch (aMessage.name) { case "child-process-shutdown": if (DEBUG) debug("Child process shutdown received."); - this.removeMessageManager(mm); + this.removeMessageManager(mm, aMessage.principal); break; case "Settings:RegisterForMessages": if (!SettingsPermissions.hasSomeReadPermission(aMessage.principal)) { diff --git a/dom/settings/moz.build b/dom/settings/moz.build index c12a43e655eb..10a6055ba12c 100644 --- a/dom/settings/moz.build +++ b/dom/settings/moz.build @@ -23,3 +23,5 @@ EXTRA_JS_MODULES += [ ] MOCHITEST_MANIFESTS += ['tests/mochitest.ini'] + +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] diff --git a/dom/settings/tests/unit/test_settingsrequestmanager_messages.js b/dom/settings/tests/unit/test_settingsrequestmanager_messages.js new file mode 100644 index 000000000000..e8fae7bc0377 --- /dev/null +++ b/dom/settings/tests/unit/test_settingsrequestmanager_messages.js @@ -0,0 +1,154 @@ +"use strict"; + +const Cu = Components.utils; + +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +Cu.import("resource://gre/modules/Services.jsm"); + +XPCOMUtils.defineLazyServiceGetter(this, "cpmm", + "@mozilla.org/childprocessmessagemanager;1", + "nsIMessageSender"); + +let principal = Services.scriptSecurityManager.getSystemPrincipal(); +let lockID = "{435d2192-4f21-48d4-90b7-285f147a56be}"; + +// Helper to start the Settings Request Manager +function startSettingsRequestManager() { + Cu.import("resource://gre/modules/SettingsRequestManager.jsm"); +} + +// Helper function to add a listener, send message and treat the reply +function addAndSend(msg, reply, callback, payload, runNext = true) { + let handler = { + receiveMessage: function(message) { + if (message.name === reply) { + cpmm.removeMessageListener(reply, handler); + callback(message); + if (runNext) { + run_next_test(); + } + } + } + }; + cpmm.addMessageListener(reply, handler); + cpmm.sendAsyncMessage(msg, payload, undefined, principal); +} + +// We need to trigger a Settings:Run message to make the queue progress +function send_settingsRun() { + let msg = {lockID: lockID, isServiceLock: true}; + cpmm.sendAsyncMessage("Settings:Run", msg, undefined, principal); +} + +function kill_child() { + let msg = {lockID: lockID, isServiceLock: true}; + cpmm.sendAsyncMessage("child-process-shutdown", msg, undefined, principal); +} + +function run_test() { + do_get_profile(); + startSettingsRequestManager(); + run_next_test(); +} + +add_test(function test_createLock() { + let msg = {lockID: lockID, isServiceLock: true}; + cpmm.sendAsyncMessage("Settings:CreateLock", msg, undefined, principal); + cpmm.sendAsyncMessage( + "Settings:RegisterForMessages", undefined, undefined, principal); + ok(true); + run_next_test(); +}); + +add_test(function test_get_empty() { + let requestID = 10; + let msgReply = "Settings:Get:OK"; + let msgHandler = function(message) { + equal(requestID, message.data.requestID); + equal(lockID, message.data.lockID); + ok(Object.keys(message.data.settings).length >= 0); + }; + + addAndSend("Settings:Get", msgReply, msgHandler, { + requestID: requestID, + lockID: lockID, + name: "language.current" + }); + + send_settingsRun(); +}); + +add_test(function test_set_get_nonempty() { + let settings = { "language.current": "fr-FR:XPC" }; + let requestIDSet = 20; + let msgReplySet = "Settings:Set:OK"; + let msgHandlerSet = function(message) { + equal(requestIDSet, message.data.requestID); + equal(lockID, message.data.lockID); + }; + + addAndSend("Settings:Set", msgReplySet, msgHandlerSet, { + requestID: requestIDSet, + lockID: lockID, + settings: settings + }, false); + + let requestIDGet = 25; + let msgReplyGet = "Settings:Get:OK"; + let msgHandlerGet = function(message) { + equal(requestIDGet, message.data.requestID); + equal(lockID, message.data.lockID); + for(let p in settings) { + equal(settings[p], message.data.settings[p]); + } + }; + + addAndSend("Settings:Get", msgReplyGet, msgHandlerGet, { + requestID: requestIDGet, + lockID: lockID, + name: Object.keys(settings)[0] + }); + + // Set and Get have been push into the queue, let's run + send_settingsRun(); +}); + +// This test exposes bug 1076597 behavior +add_test(function test_wait_for_finalize() { + let settings = { "language.current": "en-US:XPC" }; + let requestIDSet = 30; + let msgReplySet = "Settings:Set:OK"; + let msgHandlerSet = function(message) { + equal(requestIDSet, message.data.requestID); + equal(lockID, message.data.lockID); + }; + + addAndSend("Settings:Set", msgReplySet, msgHandlerSet, { + requestID: requestIDSet, + lockID: lockID, + settings: settings + }, false); + + let requestIDGet = 35; + let msgReplyGet = "Settings:Get:OK"; + let msgHandlerGet = function(message) { + equal(requestIDGet, message.data.requestID); + equal(lockID, message.data.lockID); + for(let p in settings) { + equal(settings[p], message.data.settings[p]); + } + }; + + addAndSend("Settings:Get", msgReplyGet, msgHandlerGet, { + requestID: requestIDGet, + lockID: lockID, + name: Object.keys(settings)[0] + }); + + // We simulate a child death, which will force previous requests to be set + // into finalize state + kill_child(); + + // Then when we issue Settings:Run, those finalized should be triggered + send_settingsRun(); +}); diff --git a/dom/settings/tests/unit/xpcshell.ini b/dom/settings/tests/unit/xpcshell.ini new file mode 100644 index 000000000000..b1af85b1d051 --- /dev/null +++ b/dom/settings/tests/unit/xpcshell.ini @@ -0,0 +1,6 @@ +[DEFAULT] +head = +tail = + +[test_settingsrequestmanager_messages.js] +skip-if = ((buildapp != 'b2g') || ((toolkit == 'gonk') && debug)) # bug 1080377: for some reason, this is not working on emulator-b2g debug build From 23a3e7616d12277cebb84001547fcde2ba84dda5 Mon Sep 17 00:00:00 2001 From: Marcus Bizal Date: Tue, 21 Oct 2014 10:46:31 +0200 Subject: [PATCH 44/70] Bug 1084419 - Share button tooltip shouldn't use title capitalization. r=dao --- .../browser/customizableui/customizableWidgets.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties index 187412020a83..bd8272ea6998 100644 --- a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties +++ b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties @@ -103,7 +103,7 @@ loop-call-button3.label = Hello loop-call-button3.tooltiptext = Start a conversation social-share-button.label = Share This Page -social-share-button.tooltiptext = Share This Page +social-share-button.tooltiptext = Share this page panic-button.label = Forget panic-button.tooltiptext = Forget about some browsing history From f8a30cc36920a7c1067b87d0eca8d8a6dbeea764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Tue, 21 Oct 2014 10:46:39 +0200 Subject: [PATCH 45/70] Bug 1080784 - Enable tabview tests in e10s. r=ttaubert --- browser/components/tabview/test/browser.ini | 8 +++++++- .../tabview/test/browser_tabview_firstrun_pref.js | 3 +-- .../tabview/test/browser_tabview_startup_transitions.js | 5 ++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/browser/components/tabview/test/browser.ini b/browser/components/tabview/test/browser.ini index d8b11e52fb54..1ff67d017ef4 100644 --- a/browser/components/tabview/test/browser.ini +++ b/browser/components/tabview/test/browser.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if = e10s # Most of these tests fail due to Bug ?????? - SessionStore is disabled in e10s support-files = dummy_page.html head.js @@ -23,6 +22,7 @@ skip-if = buildapp == 'mulet' [browser_tabview_bug587990.js] [browser_tabview_bug588265.js] [browser_tabview_bug589324.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug590606.js] [browser_tabview_bug591706.js] [browser_tabview_bug593283.js] @@ -36,6 +36,7 @@ skip-if = buildapp == 'mulet' [browser_tabview_bug595930.js] [browser_tabview_bug595943.js] [browser_tabview_bug595965.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug596781.js] [browser_tabview_bug597360.js] [browser_tabview_bug597399.js] @@ -56,6 +57,7 @@ skip-if = true # Bug 704417 [browser_tabview_bug607108.js] skip-if = os == 'linux' # Bug 947521 [browser_tabview_bug608037.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug608153.js] [browser_tabview_bug608158.js] [browser_tabview_bug608184.js] @@ -74,12 +76,14 @@ skip-if = buildapp == 'mulet' [browser_tabview_bug619937.js] [browser_tabview_bug622835.js] [browser_tabview_bug623768.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug624265_perwindowpb.js] skip-if = true # Bug 921984, hopefully fixed by bug 930202 [browser_tabview_bug624692.js] [browser_tabview_bug624727_perwindowpb.js] skip-if = buildapp == 'mulet' [browser_tabview_bug624847.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug624931.js] [browser_tabview_bug624953.js] [browser_tabview_bug625195.js] @@ -88,6 +92,7 @@ skip-if = buildapp == 'mulet' [browser_tabview_bug625955.js] [browser_tabview_bug626368.js] [browser_tabview_bug626455.js] +skip-if = e10s # Bug 1086190 [browser_tabview_bug626525.js] [browser_tabview_bug626791.js] skip-if = buildapp == 'mulet' @@ -173,6 +178,7 @@ skip-if = buildapp == 'mulet' skip-if = os == "mac" || os == "win" # Bug 945687 [browser_tabview_launch.js] [browser_tabview_multiwindow_search.js] +skip-if = e10s # Bug 1086190 [browser_tabview_pending_tabs.js] [browser_tabview_privatebrowsing_perwindowpb.js] skip-if = os == 'linux' || e10s # linux: Bug 944300; e10s: bug ?????? - "leaked until shutdown [nsGlobalWindow #82 about:blank]" diff --git a/browser/components/tabview/test/browser_tabview_firstrun_pref.js b/browser/components/tabview/test/browser_tabview_firstrun_pref.js index 24b27cf5a6d4..36a43f22d907 100644 --- a/browser/components/tabview/test/browser_tabview_firstrun_pref.js +++ b/browser/components/tabview/test/browser_tabview_firstrun_pref.js @@ -63,9 +63,8 @@ function endGame() { } function newWindowWithTabView(callback, completeCallback) { - let charsetArg = "charset=" + window.content.document.characterSet; let win = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no,height=800,width=800", - "about:blank", charsetArg, null, null, true); + "about:blank", null, null, null, true); let onLoad = function() { win.removeEventListener("load", onLoad, false); let onShown = function() { diff --git a/browser/components/tabview/test/browser_tabview_startup_transitions.js b/browser/components/tabview/test/browser_tabview_startup_transitions.js index a57e29466892..7eef96934316 100644 --- a/browser/components/tabview/test/browser_tabview_startup_transitions.js +++ b/browser/components/tabview/test/browser_tabview_startup_transitions.js @@ -9,10 +9,9 @@ function animateZoom() prefsBranch.getBoolPref("animate_zoom"); function test() { waitForExplicitFinish(); - - let charsetArg = "charset=" + window.content.document.characterSet; + let win = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", - "about:blank", charsetArg, null, null, true); + "about:blank", null, null, null, true); registerCleanupFunction(function() { prefsBranch.setBoolPref("animate_zoom", true); From 107d3291ee06b43095dcd81278ec51d7b5b2443c Mon Sep 17 00:00:00 2001 From: vivek Date: Mon, 20 Oct 2014 10:44:00 +0200 Subject: [PATCH 46/70] Bug 1064038 - "Handle errors for About Feedback form submission". r=margaret --- mobile/android/chrome/content/aboutFeedback.js | 1 + mobile/android/chrome/content/aboutFeedback.xhtml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mobile/android/chrome/content/aboutFeedback.js b/mobile/android/chrome/content/aboutFeedback.js index 314c9dc93690..6d81b9241e70 100644 --- a/mobile/android/chrome/content/aboutFeedback.js +++ b/mobile/android/chrome/content/aboutFeedback.js @@ -77,6 +77,7 @@ function init() { // Fill "Last visited site" input with most recent history entry URL. Services.obs.addObserver(function observer(aSubject, aTopic, aData) { + aData = aData.substring(0, 200); document.getElementById("last-url").value = aData; // Enable the parent div iff the URL is valid. if (aData.length != 0) { diff --git a/mobile/android/chrome/content/aboutFeedback.xhtml b/mobile/android/chrome/content/aboutFeedback.xhtml index 4bd50d4ad645..05c63b2a21bd 100644 --- a/mobile/android/chrome/content/aboutFeedback.xhtml +++ b/mobile/android/chrome/content/aboutFeedback.xhtml @@ -59,7 +59,7 @@

&sad.header;

&sad.message;
-