From 24bb25cf7aa78e5a76a1aad985ad867243056d6c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 07:00:33 -0700 Subject: [PATCH 01/16] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5327fbfecfcb Author: Yura Zenevich Desc: Merge pull request #31312 from yzen/bug-1193018-system Bug 1193018 - [System] making non-natively-focusable elements focusable. ======== https://hg.mozilla.org/integration/gaia-central/rev/2ce7256ede01 Author: Yura Zenevich Desc: Bug 1193018 - [System] making non-natively-focusable elements focusable. ======== https://hg.mozilla.org/integration/gaia-central/rev/a02375871650 Author: Yura Zenevich Desc: Merge pull request #31310 from yzen/bug-1193018-music Bug 1193018 - [Music] making non-natively-focusable elements focusable. ======== https://hg.mozilla.org/integration/gaia-central/rev/a500105a0309 Author: Yura Zenevich Desc: Bug 1193018 - [Music] making non-natively-focusable elements focusable. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b0f4f2c01a92..b61a3992f244 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "2d7f369fd923b6df3b00d76844c413c1202c04ba", + "git_revision": "2052b591db7af90341012ea780bcca3f54d100e0", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "5c86f4cf87b91d2bfe9a3e49aa8706b452e4f97e", + "revision": "5327fbfecfcb635c5fe872379e730cf2b4091038", "repo_path": "integration/gaia-central" } From 0824be21cbcdd80c2cb6508503afe37a5e711de8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 07:02:10 -0700 Subject: [PATCH 02/16] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- 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-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 023ddbffb4fe..9047d8a42795 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index a189e51130a4..ba303c642e7f 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 2e969d0a9240..ee4a42ee3800 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 ead4bb103887..4d5baae97492 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 b493a15309ff..32dc5ed99ae0 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-l/sources.xml b/b2g/config/emulator-l/sources.xml index 03dc44271970..4a55f0cf3dfb 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2e969d0a9240..ee4a42ee3800 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 0949076df167..c599d01a5f14 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e3794d1f1789..b78a6328441a 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index c88fbf33d90a..ec31f9e4fae9 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 7969b21bcc943c550e5c1d2c983885bf35fbabc4 Mon Sep 17 00:00:00 2001 From: Alastor Wu Date: Thu, 26 Mar 2015 16:27:25 +0800 Subject: [PATCH 03/16] Bug 1129882 - Create agent in telephony object. r=szchen, r=htsai --- dom/telephony/Telephony.cpp | 116 ++++++++++++++++++++++++++- dom/telephony/Telephony.h | 22 +++++ dom/telephony/TelephonyCall.cpp | 105 +++++++++++++++--------- dom/telephony/TelephonyCall.h | 7 ++ dom/telephony/TelephonyCallGroup.cpp | 60 ++++++++++---- dom/telephony/TelephonyCallGroup.h | 8 ++ dom/webidl/Telephony.webidl | 6 ++ 7 files changed, 265 insertions(+), 59 deletions(-) diff --git a/dom/telephony/Telephony.cpp b/dom/telephony/Telephony.cpp index 4ca27cab41d7..75734c97e93c 100644 --- a/dom/telephony/Telephony.cpp +++ b/dom/telephony/Telephony.cpp @@ -7,6 +7,7 @@ #include "Telephony.h" #include "mozilla/Preferences.h" +#include "mozilla/dom/AudioChannelBinding.h" #include "mozilla/dom/CallEvent.h" #include "mozilla/dom/MozMobileConnectionBinding.h" #include "mozilla/dom/Promise.h" @@ -20,6 +21,7 @@ #include "nsServiceManagerUtils.h" #include "nsThreadUtils.h" +#include "AudioChannelAgent.h" #include "CallsList.h" #include "TelephonyCall.h" #include "TelephonyCallGroup.h" @@ -62,8 +64,11 @@ public: }; Telephony::Telephony(nsPIDOMWindow* aOwner) - : DOMEventTargetHelper(aOwner) + : DOMEventTargetHelper(aOwner), + mIsAudioStartPlaying(false), + mAudioAgentNotify(nsIAudioChannelAgent::AUDIO_AGENT_NOTIFY) { + MOZ_ASSERT(aOwner); nsCOMPtr global = do_QueryInterface(aOwner); MOZ_ASSERT(global); @@ -518,6 +523,61 @@ Telephony::StopTone(const Optional& aServiceId, ErrorResult& aRv) aRv = mService->StopTone(serviceId); } +void +Telephony::OwnAudioChannel(ErrorResult& aRv) +{ + if (mAudioAgent) { + return; + } + + mAudioAgent = do_CreateInstance("@mozilla.org/audiochannelagent;1"); + MOZ_ASSERT(mAudioAgent); + aRv = mAudioAgent->Init(GetParentObject(), + (int32_t)AudioChannel::Telephony, this); + if (NS_WARN_IF(aRv.Failed())) { + return; + } + aRv = HandleAudioAgentState(); + if (NS_WARN_IF(aRv.Failed())) { + return; + } +} + +nsresult +Telephony::HandleAudioAgentState() +{ + if (!mAudioAgent) { + return NS_OK; + } + + Nullable activeCall; + GetActive(activeCall); + nsresult rv; + // Only stop agent when the call is disconnected. + if ((!mCalls.Length() && !mGroup->CallsArray().Length()) && + mIsAudioStartPlaying) { + mIsAudioStartPlaying = false; + rv = mAudioAgent->NotifyStoppedPlaying(mAudioAgentNotify); + mAudioAgent = nullptr; + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + } else if (!activeCall.IsNull() && !mIsAudioStartPlaying) { + mIsAudioStartPlaying = true; + float volume = 1.0; + bool muted = false; + rv = mAudioAgent->NotifyStartedPlaying(mAudioAgentNotify, &volume, &muted); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + rv = WindowVolumeChanged(volume, muted); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + } + return NS_OK; +} + bool Telephony::GetMuted(ErrorResult& aRv) const { @@ -591,13 +651,62 @@ Telephony::GetReady(ErrorResult& aRv) const return promise.forget(); } +// nsIAudioChannelAgentCallback + +NS_IMETHODIMP +Telephony::WindowVolumeChanged(float aVolume, bool aMuted) +{ + // Check the limitation of the network connection + if (mCalls.Length() > 1 || + (mCalls.Length() == 1 && mGroup->CallsArray().Length())) { + return NS_ERROR_FAILURE; + } + + ErrorResult rv; + nsCOMPtr global = do_QueryInterface(GetOwner()); + nsRefPtr promise = Promise::Create(global, rv); + if (NS_WARN_IF(rv.Failed())) { + return rv.StealNSResult(); + } + + // Check the single call or conference call + bool isSingleCall = mCalls.Length(); + nsCOMPtr callback = new TelephonyCallback(promise); + if (isSingleCall) { + rv = aMuted ? mCalls[0]->Hold(callback) : mCalls[0]->Resume(callback); + } else { + rv = aMuted ? mGroup->Hold(callback) : mGroup->Resume(callback); + } + if (NS_WARN_IF(rv.Failed())) { + return rv.StealNSResult(); + } + + return NS_OK; +} + +NS_IMETHODIMP +Telephony::WindowAudioCaptureChanged() +{ + // Do nothing + return NS_OK; +} + // nsITelephonyListener NS_IMETHODIMP Telephony::CallStateChanged(uint32_t aLength, nsITelephonyCallInfo** aAllInfo) { + nsresult rv; for (uint32_t i = 0; i < aLength; ++i) { - HandleCallInfo(aAllInfo[i]); + rv = HandleCallInfo(aAllInfo[i]); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + } + + rv = HandleAudioAgentState(); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; } return NS_OK; } @@ -605,7 +714,8 @@ Telephony::CallStateChanged(uint32_t aLength, nsITelephonyCallInfo** aAllInfo) NS_IMETHODIMP Telephony::EnumerateCallState(nsITelephonyCallInfo* aInfo) { - return HandleCallInfo(aInfo); + uint32_t currentCallNum = 1; + return CallStateChanged(currentCallNum, &aInfo); } NS_IMETHODIMP diff --git a/dom/telephony/Telephony.h b/dom/telephony/Telephony.h index 0ef8ce27704d..77863fec624a 100644 --- a/dom/telephony/Telephony.h +++ b/dom/telephony/Telephony.h @@ -11,6 +11,7 @@ #include "mozilla/dom/Promise.h" #include "mozilla/dom/telephony/TelephonyCommon.h" +#include "nsIAudioChannelAgent.h" #include "nsITelephonyCallInfo.h" #include "nsITelephonyService.h" @@ -31,6 +32,7 @@ class TelephonyDialCallback; class OwningTelephonyCallOrTelephonyCallGroup; class Telephony final : public DOMEventTargetHelper, + public nsIAudioChannelAgentCallback, private nsITelephonyListener { /** @@ -44,6 +46,8 @@ class Telephony final : public DOMEventTargetHelper, friend class telephony::TelephonyDialCallback; + // The audio agent is needed to communicate with the audio channel service. + nsCOMPtr mAudioAgent; nsCOMPtr mService; nsRefPtr mListener; @@ -54,8 +58,13 @@ class Telephony final : public DOMEventTargetHelper, nsRefPtr mReadyPromise; + bool mIsAudioStartPlaying; + + uint32_t mAudioAgentNotify; + public: NS_DECL_ISUPPORTS_INHERITED + NS_DECL_NSIAUDIOCHANNELAGENTCALLBACK NS_DECL_NSITELEPHONYLISTENER NS_REALLY_FORWARD_NSIDOMEVENTTARGET(DOMEventTargetHelper) NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(Telephony, @@ -94,6 +103,15 @@ public: void StopTone(const Optional& aServiceId, ErrorResult& aRv); + // In the audio channel architecture, the system app needs to know the state + // of every audio channel, including the telephony. Therefore, when a + // telephony call is activated , the audio channel service would notify the + // system app about that. And we need a agent to communicate with the audio + // channel service. We would follow the call states to make a correct + // notification. + void + OwnAudioChannel(ErrorResult& aRv); + bool GetMuted(ErrorResult& aRv) const; @@ -213,6 +231,10 @@ private: nsresult HandleCallInfo(nsITelephonyCallInfo* aInfo); + + // Check the call states to decide whether need to send the notificaiton. + nsresult + HandleAudioAgentState(); }; } // namespace dom diff --git a/dom/telephony/TelephonyCall.cpp b/dom/telephony/TelephonyCall.cpp index cfe87cbb6397..d1ab58f7d49f 100644 --- a/dom/telephony/TelephonyCall.cpp +++ b/dom/telephony/TelephonyCall.cpp @@ -324,34 +324,10 @@ TelephonyCall::Hold(ErrorResult& aRv) return nullptr; } - if (mCallState != nsITelephonyService::CALL_STATE_CONNECTED) { - NS_WARNING(nsPrintfCString("Hold non-connected call is rejected!" - " (State: %u)", mCallState).get()); - promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR); - return promise.forget(); - } - - if (mGroup) { - NS_WARNING("Hold a call in conference is rejected!"); - promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR); - return promise.forget(); - } - - if (!mSwitchable) { - NS_WARNING("Hold a non-switchable call is rejected!"); - promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR); - return promise.forget(); - } - nsCOMPtr callback = new TelephonyCallback(promise); - aRv = mTelephony->Service()->HoldCall(mServiceId, mCallIndex, callback); - NS_ENSURE_TRUE(!aRv.Failed(), nullptr); - - if (mSecondId) { - // No state transition when we switch two numbers within one TelephonyCall - // object. Otherwise, the state here will be inconsistent with the backend - // RIL and will never be right. - return promise.forget(); + aRv = Hold(callback); + if (NS_WARN_IF(aRv.Failed())) { + return nullptr; } return promise.forget(); @@ -365,28 +341,77 @@ TelephonyCall::Resume(ErrorResult& aRv) return nullptr; } - if (mCallState != nsITelephonyService::CALL_STATE_HELD) { - NS_WARNING(nsPrintfCString("Resume non-held call is rejected!" + nsCOMPtr callback = new TelephonyCallback(promise); + aRv = Resume(callback); + if (NS_WARN_IF(aRv.Failed())) { + return nullptr; + } + + return promise.forget(); +} + +nsresult +TelephonyCall::Hold(nsITelephonyCallback* aCallback) +{ + if (mCallState != nsITelephonyService::CALL_STATE_CONNECTED) { + NS_WARNING(nsPrintfCString("Hold non-connected call is rejected!" " (State: %u)", mCallState).get()); - promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR); - return promise.forget(); + aCallback->NotifyError(NS_LITERAL_STRING("InvalidStateError")); + return NS_ERROR_DOM_INVALID_STATE_ERR; + } + + if (mGroup) { + NS_WARNING("Hold a call in conference is rejected!"); + aCallback->NotifyError(NS_LITERAL_STRING("InvalidStateError")); + return NS_ERROR_DOM_INVALID_STATE_ERR; + } + + if (!mSwitchable) { + NS_WARNING("Hold a non-switchable call is rejected!"); + aCallback->NotifyError(NS_LITERAL_STRING("InvalidStateError")); + return NS_ERROR_DOM_INVALID_STATE_ERR; + } + + nsresult rv = mTelephony->Service()->HoldCall(mServiceId, mCallIndex, aCallback); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + if (mSecondId) { + // No state transition when we switch two numbers within one TelephonyCall + // object. Otherwise, the state here will be inconsistent with the backend + // RIL and will never be right. + return NS_OK; + } + + return NS_OK; +} + +nsresult +TelephonyCall::Resume(nsITelephonyCallback* aCallback) +{ + if (mCallState != nsITelephonyService::CALL_STATE_HELD) { + NS_WARNING("Resume non-held call is rejected!"); + aCallback->NotifyError(NS_LITERAL_STRING("InvalidStateError")); + return NS_ERROR_DOM_INVALID_STATE_ERR; } if (mGroup) { NS_WARNING("Resume a call in conference is rejected!"); - promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR); - return promise.forget(); + aCallback->NotifyError(NS_LITERAL_STRING("InvalidStateError")); + return NS_ERROR_DOM_INVALID_STATE_ERR; } if (!mSwitchable) { NS_WARNING("Resume a non-switchable call is rejected!"); - promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR); - return promise.forget(); + aCallback->NotifyError(NS_LITERAL_STRING("InvalidStateError")); + return NS_ERROR_DOM_INVALID_STATE_ERR; } - nsCOMPtr callback = new TelephonyCallback(promise); - aRv = mTelephony->Service()->ResumeCall(mServiceId, mCallIndex, callback); - NS_ENSURE_TRUE(!aRv.Failed(), nullptr); + nsresult rv = mTelephony->Service()->ResumeCall(mServiceId, mCallIndex, aCallback); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } - return promise.forget(); -} + return NS_OK; +} \ No newline at end of file diff --git a/dom/telephony/TelephonyCall.h b/dom/telephony/TelephonyCall.h index dbb53f444bb9..4d4bae031de2 100644 --- a/dom/telephony/TelephonyCall.h +++ b/dom/telephony/TelephonyCall.h @@ -12,6 +12,7 @@ #include "mozilla/dom/TelephonyCallBinding.h" #include "mozilla/dom/TelephonyCallId.h" #include "mozilla/dom/telephony/TelephonyCommon.h" +#include "nsITelephonyService.h" class nsPIDOMWindow; @@ -185,6 +186,12 @@ private: ~TelephonyCall(); + nsresult + Hold(nsITelephonyCallback* aCallback); + + nsresult + Resume(nsITelephonyCallback* aCallback); + void ChangeStateInternal(uint16_t aCallState, bool aFireEvents); diff --git a/dom/telephony/TelephonyCallGroup.cpp b/dom/telephony/TelephonyCallGroup.cpp index 541cc134a79b..addfe94cfa48 100644 --- a/dom/telephony/TelephonyCallGroup.cpp +++ b/dom/telephony/TelephonyCallGroup.cpp @@ -347,16 +347,12 @@ TelephonyCallGroup::Hold(ErrorResult& aRv) return nullptr; } - if (mCallState != nsITelephonyService::CALL_STATE_CONNECTED) { - NS_WARNING("Holding a non-connected call is rejected!"); - promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR); - return promise.forget(); + nsCOMPtr callback = new TelephonyCallback(promise); + aRv = Hold(callback); + if (NS_WARN_IF(aRv.Failed())) { + return nullptr; } - nsCOMPtr callback = new TelephonyCallback(promise); - aRv = mTelephony->Service()->HoldConference(mCalls[0]->ServiceId(), - callback); - NS_ENSURE_TRUE(!aRv.Failed(), nullptr); return promise.forget(); } @@ -370,15 +366,47 @@ TelephonyCallGroup::Resume(ErrorResult& aRv) return nullptr; } - if (mCallState != nsITelephonyService::CALL_STATE_HELD) { - NS_WARNING("Resuming a non-held call is rejected!"); - promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR); - return promise.forget(); + nsCOMPtr callback = new TelephonyCallback(promise); + aRv = Resume(callback); + if (NS_WARN_IF(aRv.Failed())) { + return nullptr; } - nsCOMPtr callback = new TelephonyCallback(promise); - aRv = mTelephony->Service()->ResumeConference(mCalls[0]->ServiceId(), - callback); - NS_ENSURE_TRUE(!aRv.Failed(), nullptr); return promise.forget(); } + +nsresult +TelephonyCallGroup::Hold(nsITelephonyCallback* aCallback) +{ + if (mCallState != nsITelephonyService::CALL_STATE_CONNECTED) { + NS_WARNING("Holding a non-connected call is rejected!"); + aCallback->NotifyError(NS_LITERAL_STRING("InvalidStateError")); + return NS_ERROR_DOM_INVALID_STATE_ERR; + } + + nsresult rv = mTelephony->Service()->HoldConference(mCalls[0]->ServiceId(), + aCallback); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + return NS_OK; +} + +nsresult +TelephonyCallGroup::Resume(nsITelephonyCallback* aCallback) +{ + if (mCallState != nsITelephonyService::CALL_STATE_HELD) { + NS_WARNING("Resuming a non-held call is rejected!"); + aCallback->NotifyError(NS_LITERAL_STRING("InvalidStateError")); + return NS_ERROR_DOM_INVALID_STATE_ERR; + } + + nsresult rv = mTelephony->Service()->ResumeConference(mCalls[0]->ServiceId(), + aCallback); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + return NS_OK; +} diff --git a/dom/telephony/TelephonyCallGroup.h b/dom/telephony/TelephonyCallGroup.h index 38c1ba1474cd..8e473b919951 100644 --- a/dom/telephony/TelephonyCallGroup.h +++ b/dom/telephony/TelephonyCallGroup.h @@ -30,6 +30,8 @@ public: NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(TelephonyCallGroup, DOMEventTargetHelper) + friend class Telephony; + nsPIDOMWindow* GetParentObject() const { @@ -108,6 +110,12 @@ private: explicit TelephonyCallGroup(nsPIDOMWindow* aOwner); ~TelephonyCallGroup(); + nsresult + Hold(nsITelephonyCallback* aCallback); + + nsresult + Resume(nsITelephonyCallback* aCallback); + nsresult NotifyCallsChanged(TelephonyCall* aCall); diff --git a/dom/webidl/Telephony.webidl b/dom/webidl/Telephony.webidl index 5eb460b74bbc..19fd9dd80c41 100644 --- a/dom/webidl/Telephony.webidl +++ b/dom/webidl/Telephony.webidl @@ -49,6 +49,12 @@ interface Telephony : EventTarget { [Throws] void stopTone(optional unsigned long serviceId); + // Calling this method, the app will be treated as owner of the telephony + // calls from the AudioChannel policy. + [Throws, + CheckAllPermissions="audio-channel-telephony"] + void ownAudioChannel(); + [Throws] attribute boolean muted; From 63a6ffdf2ecb9588f75282999eab4f822b1e5d6c Mon Sep 17 00:00:00 2001 From: Alastor Wu Date: Mon, 10 Aug 2015 17:23:33 +0800 Subject: [PATCH 04/16] Bug 1129882 - Add mozInterrupt in telephony object. r=baku --- dom/telephony/Telephony.cpp | 22 ++++++++++++++++++++-- dom/telephony/Telephony.h | 2 ++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dom/telephony/Telephony.cpp b/dom/telephony/Telephony.cpp index 75734c97e93c..6aafc045ff4e 100644 --- a/dom/telephony/Telephony.cpp +++ b/dom/telephony/Telephony.cpp @@ -21,7 +21,7 @@ #include "nsServiceManagerUtils.h" #include "nsThreadUtils.h" -#include "AudioChannelAgent.h" +#include "AudioChannelService.h" #include "CallsList.h" #include "TelephonyCall.h" #include "TelephonyCallGroup.h" @@ -66,7 +66,8 @@ public: Telephony::Telephony(nsPIDOMWindow* aOwner) : DOMEventTargetHelper(aOwner), mIsAudioStartPlaying(false), - mAudioAgentNotify(nsIAudioChannelAgent::AUDIO_AGENT_NOTIFY) + mAudioAgentNotify(nsIAudioChannelAgent::AUDIO_AGENT_NOTIFY), + mHaveDispatchedInterruptBeginEvent(false) { MOZ_ASSERT(aOwner); nsCOMPtr global = do_QueryInterface(aOwner); @@ -77,6 +78,7 @@ Telephony::Telephony(nsPIDOMWindow* aOwner) MOZ_ASSERT(!rv.Failed()); mReadyPromise = promise; + mMuted = AudioChannelService::IsAudioChannelMutedByDefault(); } Telephony::~Telephony() @@ -681,6 +683,22 @@ Telephony::WindowVolumeChanged(float aVolume, bool aMuted) return rv.StealNSResult(); } + // These events will be triggered when the telephony is interrupted by other + // audio channel. + if (mMuted != aMuted) { + mMuted = aMuted; + // We should not dispatch "mozinterruptend" when the system app initializes + // the telephony audio from muted to unmuted at the first time. The event + // "mozinterruptend" must be dispatched after the "mozinterruptbegin". + if (!mHaveDispatchedInterruptBeginEvent && mMuted) { + DispatchTrustedEvent(NS_LITERAL_STRING("mozinterruptbegin")); + mHaveDispatchedInterruptBeginEvent = mMuted; + } else if (mHaveDispatchedInterruptBeginEvent && !mMuted) { + DispatchTrustedEvent(NS_LITERAL_STRING("mozinterruptend")); + mHaveDispatchedInterruptBeginEvent = mMuted; + } + } + return NS_OK; } diff --git a/dom/telephony/Telephony.h b/dom/telephony/Telephony.h index 77863fec624a..bf99917facb9 100644 --- a/dom/telephony/Telephony.h +++ b/dom/telephony/Telephony.h @@ -61,6 +61,8 @@ class Telephony final : public DOMEventTargetHelper, bool mIsAudioStartPlaying; uint32_t mAudioAgentNotify; + bool mHaveDispatchedInterruptBeginEvent; + bool mMuted; public: NS_DECL_ISUPPORTS_INHERITED From 80bbaca7f1cee98ff6c9bdd998806e85fa8ab9d6 Mon Sep 17 00:00:00 2001 From: Will Wang Date: Fri, 7 Aug 2015 03:15:00 -0400 Subject: [PATCH 05/16] Bug 825149 - Add NREC feature bit in bluetooth stack. r=shuang --- dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h b/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h index 5bb186f2ebd0..df9b57b5fae6 100644 --- a/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h +++ b/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h @@ -32,6 +32,7 @@ ******************************************************************************/ /* AG feature masks */ #define BTIF_HF_FEATURES ( BTA_AG_FEAT_3WAY | \ + BTA_AG_FEAT_ECNR | \ BTA_AG_FEAT_REJECT | \ BTA_AG_FEAT_ECS | \ BTA_AG_FEAT_EXTERR) From 9fd88cded3f6e440eea4868b308f5be33b427efb Mon Sep 17 00:00:00 2001 From: Will Wang Date: Mon, 10 Aug 2015 04:51:00 -0400 Subject: [PATCH 06/16] Bug 825149 - Support HFP NREC feature. r=shuang --- dom/bluetooth/BluetoothCommon.h | 1 + dom/bluetooth/BluetoothHfpManagerBase.h | 2 ++ .../bluedroid/hfp/BluetoothHfpManager.cpp | 35 +++++++++++++++++++ .../bluedroid/hfp/BluetoothHfpManager.h | 4 +++ dom/bluetooth/bluez/BluetoothHfpManager.cpp | 9 +++++ dom/bluetooth/bluez/BluetoothHfpManager.h | 1 + dom/system/gonk/AudioManager.cpp | 18 ++++++++++ 7 files changed, 70 insertions(+) diff --git a/dom/bluetooth/BluetoothCommon.h b/dom/bluetooth/BluetoothCommon.h index 7aebc1ec3a9e..d6e36991cb6b 100644 --- a/dom/bluetooth/BluetoothCommon.h +++ b/dom/bluetooth/BluetoothCommon.h @@ -168,6 +168,7 @@ extern bool gBluetoothDebugFlag; */ #define BLUETOOTH_A2DP_STATUS_CHANGED_ID "bluetooth-a2dp-status-changed" #define BLUETOOTH_HFP_STATUS_CHANGED_ID "bluetooth-hfp-status-changed" +#define BLUETOOTH_HFP_NREC_STATUS_CHANGED_ID "bluetooth-hfp-nrec-status-changed" #define BLUETOOTH_HID_STATUS_CHANGED_ID "bluetooth-hid-status-changed" #define BLUETOOTH_SCO_STATUS_CHANGED_ID "bluetooth-sco-status-changed" diff --git a/dom/bluetooth/BluetoothHfpManagerBase.h b/dom/bluetooth/BluetoothHfpManagerBase.h index 61c11a474a3a..504840f95500 100644 --- a/dom/bluetooth/BluetoothHfpManagerBase.h +++ b/dom/bluetooth/BluetoothHfpManagerBase.h @@ -18,6 +18,8 @@ public: * Returns true if Sco is connected. */ virtual bool IsScoConnected() = 0; + + virtual bool IsNrecEnabled() = 0; }; #define BT_DECL_HFP_MGR_BASE \ diff --git a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp index 3cbf2c85020a..b10ff5647fce 100644 --- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp @@ -220,6 +220,7 @@ BluetoothHfpManager::Cleanup() mService = HFP_NETWORK_STATE_NOT_AVAILABLE; mRoam = HFP_SERVICE_TYPE_HOME; mSignal = 0; + mNrecEnabled = HFP_NREC_STARTED; mController = nullptr; } @@ -1205,6 +1206,12 @@ BluetoothHfpManager::IsConnected() return (mConnectionState == HFP_CONNECTION_STATE_SLC_CONNECTED); } +bool +BluetoothHfpManager::IsNrecEnabled() +{ + return mNrecEnabled; +} + void BluetoothHfpManager::OnConnectError() { @@ -1389,6 +1396,12 @@ BluetoothHfpManager::ConnectionStateNotification( DisconnectSco(); NotifyConnectionStateChanged( NS_LITERAL_STRING(BLUETOOTH_HFP_STATUS_CHANGED_ID)); + + } else if (aState == HFP_CONNECTION_STATE_CONNECTED) { + // Once RFCOMM is connected, enable NREC before each new SLC connection + mNrecEnabled = HFP_NREC_STARTED; + NotifyConnectionStateChanged( + NS_LITERAL_STRING(BLUETOOTH_HFP_NREC_STATUS_CHANGED_ID)); } } @@ -1465,6 +1478,28 @@ BluetoothHfpManager::DtmfNotification(char aDtmf, const nsAString& aBdAddress) NotifyDialer(NS_ConvertUTF8toUTF16(message)); } +void +BluetoothHfpManager::NRECNotification(BluetoothHandsfreeNRECState aNrec, + const nsAString& aBdAddr) +{ + MOZ_ASSERT(NS_IsMainThread()); + + // Notify Gecko observers + nsCOMPtr obs = services::GetObserverService(); + NS_ENSURE_TRUE_VOID(obs); + + // Set NREC status once getting AT command + mNrecEnabled = static_cast(aNrec); + + // Notify audio manager + if (NS_FAILED(obs->NotifyObservers(this, + BLUETOOTH_HFP_NREC_STATUS_CHANGED_ID, + mDeviceAddress.get()))) { + BT_WARNING("Failed to notify bluetooth-hfp-nrec-status-changed observsers!"); + } + +} + void BluetoothHfpManager::CallHoldNotification(BluetoothHandsfreeCallHoldType aChld, const nsAString& aBdAddress) diff --git a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h index 99c4881db8a9..7487aad92ed6 100644 --- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h +++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h @@ -92,6 +92,7 @@ public: bool ConnectSco(); bool DisconnectSco(); + bool IsNrecEnabled(); /** * @param aSend A boolean indicates whether we need to notify headset or not @@ -127,6 +128,8 @@ public: const nsAString& aBdAddress) override; void DtmfNotification(char aDtmf, const nsAString& aBdAddress) override; + void NRECNotification(BluetoothHandsfreeNRECState aNrec, + const nsAString& aBdAddr) override; void CallHoldNotification(BluetoothHandsfreeCallHoldType aChld, const nsAString& aBdAddress) override; void DialCallNotification(const nsAString& aNumber, @@ -213,6 +216,7 @@ private: bool mReceiveVgsFlag; // This flag is for HFP only, not for HSP. bool mDialingRequestProcessed; + bool mNrecEnabled; PhoneType mPhoneType; nsString mDeviceAddress; nsString mMsisdn; diff --git a/dom/bluetooth/bluez/BluetoothHfpManager.cpp b/dom/bluetooth/bluez/BluetoothHfpManager.cpp index 5aa46fe9ee17..eb58686012e7 100644 --- a/dom/bluetooth/bluez/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluez/BluetoothHfpManager.cpp @@ -2105,5 +2105,14 @@ BluetoothHfpManager::OnDisconnect(const nsAString& aErrorStr) controller->NotifyCompletion(aErrorStr); } +bool +BluetoothHfpManager::IsNrecEnabled() +{ + // Add this function and return default value to avoid build break + // since NREC function isn't developed in bluez yet. + // Please see Bug 825149 for more information. + return HFP_NREC_STARTED; +} + NS_IMPL_ISUPPORTS(BluetoothHfpManager, nsIObserver) diff --git a/dom/bluetooth/bluez/BluetoothHfpManager.h b/dom/bluetooth/bluez/BluetoothHfpManager.h index 0dec57287ff4..061f3c6925c9 100644 --- a/dom/bluetooth/bluez/BluetoothHfpManager.h +++ b/dom/bluetooth/bluez/BluetoothHfpManager.h @@ -103,6 +103,7 @@ public: */ bool ConnectSco(BluetoothReplyRunnable* aRunnable = nullptr); bool DisconnectSco(); + bool IsNrecEnabled(); bool ListenSco(); #ifdef MOZ_B2G_RIL diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp index 0d8b99f2a5dd..b270ec953927 100644 --- a/dom/system/gonk/AudioManager.cpp +++ b/dom/system/gonk/AudioManager.cpp @@ -372,6 +372,17 @@ AudioManager::HandleBluetoothStatusChanged(nsISupports* aSubject, audioState, aAddress.get()); AudioSystem::setDeviceConnectionState(AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, audioState, aAddress.get()); + } else if (!strcmp(aTopic, BLUETOOTH_HFP_NREC_STATUS_CHANGED_ID)) { + String8 cmd; + BluetoothHfpManagerBase* hfp = + static_cast(aSubject); + if (hfp->IsNrecEnabled()) { + cmd.setTo("bt_headset_name=;bt_headset_nrec=on"); + AudioSystem::setParameters(0, cmd); + } else { + cmd.setTo("bt_headset_name=;bt_headset_nrec=off"); + AudioSystem::setParameters(0, cmd); + } } #endif } @@ -409,6 +420,7 @@ AudioManager::Observe(nsISupports* aSubject, { if ((strcmp(aTopic, BLUETOOTH_SCO_STATUS_CHANGED_ID) == 0) || (strcmp(aTopic, BLUETOOTH_HFP_STATUS_CHANGED_ID) == 0) || + (strcmp(aTopic, BLUETOOTH_HFP_NREC_STATUS_CHANGED_ID) == 0) || (strcmp(aTopic, BLUETOOTH_A2DP_STATUS_CHANGED_ID) == 0)) { nsCString address = NS_ConvertUTF16toUTF8(nsDependentString(aData)); if (address.IsEmpty()) { @@ -553,6 +565,9 @@ AudioManager::AudioManager() if (NS_FAILED(obs->AddObserver(this, BLUETOOTH_HFP_STATUS_CHANGED_ID, false))) { NS_WARNING("Failed to add bluetooth hfp status changed observer!"); } + if (NS_FAILED(obs->AddObserver(this, BLUETOOTH_HFP_NREC_STATUS_CHANGED_ID, false))) { + NS_WARNING("Failed to add bluetooth hfp NREC status changed observer!"); + } if (NS_FAILED(obs->AddObserver(this, MOZ_SETTINGS_CHANGE_ID, false))) { NS_WARNING("Failed to add mozsettings-changed observer!"); } @@ -583,6 +598,9 @@ AudioManager::~AudioManager() { if (NS_FAILED(obs->RemoveObserver(this, BLUETOOTH_HFP_STATUS_CHANGED_ID))) { NS_WARNING("Failed to remove bluetooth hfp status changed observer!"); } + if (NS_FAILED(obs->RemoveObserver(this, BLUETOOTH_HFP_NREC_STATUS_CHANGED_ID))) { + NS_WARNING("Failed to remove bluetooth hfp NREC status changed observer!"); + } if (NS_FAILED(obs->RemoveObserver(this, MOZ_SETTINGS_CHANGE_ID))) { NS_WARNING("Failed to remove mozsettings-changed observer!"); } From 4f5aa1c75641ddcc08ea7c07c853a80dfbe5080d Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Fri, 7 Aug 2015 12:49:27 +0800 Subject: [PATCH 07/16] Bug 1159091 - Put emulator x86 kk to a separated platform in treeherder. r=garndt --- testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml | 2 -- testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml b/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml index be4435fc9158..2fffb5721d78 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml @@ -21,8 +21,6 @@ task: buildbot_step 'Build' ./build-emulator-x86.sh $HOME/workspace extra: - treeherder: - groupSymbol: x86 # Rather then enforcing particular conventions we require that all build # tasks provide the "build" extra field to specify where the build and tests # files are located. diff --git a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml b/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml index 44eff059371e..57ebfba99885 100644 --- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml @@ -4,7 +4,7 @@ $inherits: build_name: 'emulator-x86-kk' build_type: 'opt' task: - workerType: emualtor-x86-kk + workerType: emulator-x86-kk scopes: - 'docker-worker:cache:workspace-emulator-kk-x86-opt' metadata: @@ -15,8 +15,9 @@ task: - staging treeherder: # Disable "TC" prefix... + groupSymbol: "?" machine: - platform: b2g-emu-kk + platform: b2g-emu-x86-kk payload: cache: From ed3d3e18b55ac7517afd72ac60e15c2dfe018367 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 08:30:23 -0700 Subject: [PATCH 08/16] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b01e54d60162 Author: Ryan VanderMeulen Desc: Merge pull request #31293 from mykmelez/window-open-prevent-default Bug 1192489 - prevent Gecko's default window.open handler on mozbrowseropenwindow; r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/ed794f21acb0 Author: Myk Melez Desc: Bug 1192489 - prevent Gecko's default window.open handler on mozbrowseropenwindow; r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/6931ce7caf61 Author: Ryan VanderMeulen Desc: Merge pull request #31302 from wilsonpage/1174650 Bug 1174650 - [RTL][Utility Tray]The position of icons at utility-tray is mirrored ======== https://hg.mozilla.org/integration/gaia-central/rev/4149bb3080d2 Author: Wilson Page Desc: Bug 1174650 - [RTL][Utility Tray]The position of icons at utility-tray is mirrored --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b61a3992f244..0f4444dc0166 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "2052b591db7af90341012ea780bcca3f54d100e0", + "git_revision": "d618d895450d821e1ca7e73828a1404ed20ce9a0", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "5327fbfecfcb635c5fe872379e730cf2b4091038", + "revision": "b01e54d6016260c25e794ba3ed01a953bc9b2c61", "repo_path": "integration/gaia-central" } From ccecc48219644a936d3c69ddecd136e45a40364a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 08:32:00 -0700 Subject: [PATCH 09/16] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- 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 | 6 +++--- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 9047d8a42795..93d90ebb16f5 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ba303c642e7f..6ad35b44fff3 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 ee4a42ee3800..aed64ba050d6 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 4d5baae97492..5610ed0baebf 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 32dc5ed99ae0..8809e9ba1742 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + @@ -124,11 +124,11 @@ - + - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 4a55f0cf3dfb..8953c14d2d7f 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index ee4a42ee3800..aed64ba050d6 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 c599d01a5f14..c26b5c69e4b2 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b78a6328441a..b6d1056be7fc 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index ec31f9e4fae9..0c3ff7bda0f0 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From a48dcc69be272bcf780a83ba85ba15e9da3cd9b0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 08:55:27 -0700 Subject: [PATCH 10/16] Bumping gaia.json for 8 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/c941399357cc Author: Michael Henretty Desc: Merge pull request #31197 from albertopq/1188285-shared-icon-alternative Bug 1188285 - Use GaiaIconRenderer for displaying siteIcons r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/1354da5b972a Author: albertopq Desc: Bug 1188285 - Use GaiaIconRenderer for displaying siteIcons ======== https://hg.mozilla.org/integration/gaia-central/rev/066b23ab9c5c Author: Borja Salguero Desc: Merge pull request #31317 from borjasalguero/update_selfcontained Bug 1183727 - [Contacts][NGA] Create #update view and connect it to #… ======== https://hg.mozilla.org/integration/gaia-central/rev/236767f319a6 Author: borjasalguero Desc: Bug 1183727 - [Contacts][NGA] Create #update view and connect it to #open within Contacts App r=arcturus ======== https://hg.mozilla.org/integration/gaia-central/rev/387c7ba3a9f0 Author: Ryan VanderMeulen Desc: Merge pull request #31280 from snowmantw/bug1189641-rev2 Bug 1189641 - fix: move security related settings reading to state manager ======== https://hg.mozilla.org/integration/gaia-central/rev/1481a584636b Author: Greg Weng Desc: Bug 1189641 - fix: move security related settings reading to state manager ======== https://hg.mozilla.org/integration/gaia-central/rev/e9d181e12e41 Author: Ryan VanderMeulen Desc: Merge pull request #31268 from autra/bug-1191863 Bug 1191863 - Fix fm radio transition. ======== https://hg.mozilla.org/integration/gaia-central/rev/6f15fc84e60a Author: Augustin Trancart Desc: Bug 1191863 - Fix fm radio transition. FM radio never includes the gaia-theme stylesheet, so some default variable were not set, especially --transition-duration. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 0f4444dc0166..7d0d1d576699 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "d618d895450d821e1ca7e73828a1404ed20ce9a0", + "git_revision": "a21fa8d9a6629e64c19f5943eb687090100fd0f9", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "b01e54d6016260c25e794ba3ed01a953bc9b2c61", + "revision": "c941399357ccfd6e2cad35d1faf6bce345bbd517", "repo_path": "integration/gaia-central" } From 69646b904e385b8e4cdf87927f1df40462cc4a70 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 08:57:05 -0700 Subject: [PATCH 11/16] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- 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-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 93d90ebb16f5..6540c99fed2a 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 6ad35b44fff3..300c004bf802 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 aed64ba050d6..a7fc71b239a6 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 5610ed0baebf..1872b18f953b 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 8809e9ba1742..3db4fbd4bb17 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-l/sources.xml b/b2g/config/emulator-l/sources.xml index 8953c14d2d7f..fd27c7478fd3 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index aed64ba050d6..a7fc71b239a6 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 c26b5c69e4b2..c25d9e1ac9bf 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b6d1056be7fc..bbb78e0f904d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 0c3ff7bda0f0..9e29dff36e66 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 3747d931bbb46879e892b0a8f5c11b89231f61cb Mon Sep 17 00:00:00 2001 From: Gregory Arndt Date: Mon, 10 Aug 2015 21:16:59 -0500 Subject: [PATCH 12/16] Bug 1132574 - Use per branch cache for b2g and mulet builders r=jonasfj --HG-- extra : commitid : 7P8WGpK0eHF extra : rebase_source : 4f2bc9d92635dcffc0d29c4176837314ba5700c6 --- testing/taskcluster/tasks/builds/b2g_desktop_debug.yml | 4 ++-- testing/taskcluster/tasks/builds/b2g_desktop_opt.yml | 4 ++-- testing/taskcluster/tasks/builds/mulet_linux.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml index 4ac570bad47f..f2ee13419513 100644 --- a/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml +++ b/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml @@ -6,7 +6,7 @@ $inherits: task: scopes: - - 'docker-worker:cache:workspace-b2g-desktop-objects-debug' + - 'docker-worker:cache:workspace-{{project}}-b2g-desktop-objects-debug' workerType: b2g-desktop-debug extra: treeherder: @@ -15,6 +15,6 @@ task: payload: cache: - workspace-b2g-desktop-objects-debug: '/home/worker/workspace' + workspace-{{project}}-b2g-desktop-objects-debug: '/home/worker/workspace' env: MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/debug' diff --git a/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml b/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml index 61f8643fdc05..35c9752a4153 100644 --- a/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml +++ b/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml @@ -5,7 +5,7 @@ $inherits: build_type: 'opt' task: scopes: - - 'docker-worker:cache:workspace-b2g-desktop-objects-opt' + - 'docker-worker:cache:workspace-{{project}}-b2g-desktop-objects-opt' routes: - 'index.buildbot.branches.{{project}}.linux64_gecko' - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64_gecko' @@ -13,7 +13,7 @@ task: workerType: b2g-desktop-opt payload: cache: - workspace-b2g-desktop-objects-opt: '/home/worker/workspace' + workspace-{{project}}-b2g-desktop-objects-opt: '/home/worker/workspace' env: MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly' diff --git a/testing/taskcluster/tasks/builds/mulet_linux.yml b/testing/taskcluster/tasks/builds/mulet_linux.yml index 9650fb07453f..1e0654404bfc 100644 --- a/testing/taskcluster/tasks/builds/mulet_linux.yml +++ b/testing/taskcluster/tasks/builds/mulet_linux.yml @@ -15,13 +15,13 @@ task: - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-mulet' scopes: - - 'docker-worker:cache:build-mulet-linux-workspace' + - 'docker-worker:cache:build-mulet-linux-{{project}}-workspace' - 'docker-worker:cache:tooltool-cache' - 'docker-worker:relengapi-proxy:tooltool.download.public' payload: cache: - build-mulet-linux-workspace: '/home/worker/workspace' + build-mulet-linux-{{project}}-workspace: '/home/worker/workspace' tooltool-cache: '/home/worker/tools/tooltool-cache' features: From 291dd586fa54161ebb155317a7dd7070112415e1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 10:50:30 -0700 Subject: [PATCH 13/16] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/932dff6b28fd Author: Justin D'Arcangelo Desc: Merge pull request #31223 from justindarc/bug1190656 Bug 1190656 - [MediaDB] TypeError: console.warning is not a function ======== https://hg.mozilla.org/integration/gaia-central/rev/178f55f02a2b Author: Justin D'Arcangelo Desc: Bug 1190656 - [MediaDB] TypeError: console.warning is not a function --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 7d0d1d576699..b79efdfd6146 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "a21fa8d9a6629e64c19f5943eb687090100fd0f9", + "git_revision": "7c79d9ea10655505fa98c618ace1a7b44f9b860a", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "c941399357ccfd6e2cad35d1faf6bce345bbd517", + "revision": "932dff6b28fdec0450cc90fb29c2652c7ee4ec88", "repo_path": "integration/gaia-central" } From 701290f2789797f88983d16fbe7e82645ec8b6c6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 10:52:10 -0700 Subject: [PATCH 14/16] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- 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-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 6540c99fed2a..fb2dd2de7b63 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 300c004bf802..721ab19c47f4 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 a7fc71b239a6..1ba179a5cb24 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 1872b18f953b..2c0eca8e49d5 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 3db4fbd4bb17..e4c108c21bbd 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-l/sources.xml b/b2g/config/emulator-l/sources.xml index fd27c7478fd3..fd7e0a87b154 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index a7fc71b239a6..1ba179a5cb24 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 c25d9e1ac9bf..450abf039e04 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index bbb78e0f904d..d240c370a23f 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 9e29dff36e66..b9fcd846b259 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 7e8382074198b89b1427dbc4ec67af873e5a6299 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 11:45:31 -0700 Subject: [PATCH 15/16] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9db39036600a Author: Ryan VanderMeulen Desc: Revert "Merge pull request #31317 from borjasalguero/update_selfcontained" This reverts commit 81ea72db6f1777a2e2022eba27cf2f5e165d8241, reversing changes made to 6b6bc7bae0b18fa0bce70e0dfab56eb01409b5cc. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b79efdfd6146..40a1a8f7687e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "7c79d9ea10655505fa98c618ace1a7b44f9b860a", + "git_revision": "c7875bbc8b32e7b95cc55c9690b03b140905d84d", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "932dff6b28fdec0450cc90fb29c2652c7ee4ec88", + "revision": "9db39036600a1c999f93038fa0dd09a48321518e", "repo_path": "integration/gaia-central" } From 17204b8f0549550f09ba58f3809311edc2404b16 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 11 Aug 2015 11:47:12 -0700 Subject: [PATCH 16/16] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- 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-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index fb2dd2de7b63..2c0f6aebb44e 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 721ab19c47f4..8b8f5a6e3420 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 1ba179a5cb24..590bd8d1ba18 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 2c0eca8e49d5..9dc19054d65d 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 e4c108c21bbd..c1640d8fca16 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-l/sources.xml b/b2g/config/emulator-l/sources.xml index fd7e0a87b154..ab94c4e174e4 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 1ba179a5cb24..590bd8d1ba18 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 450abf039e04..5ccb5ffb8bda 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d240c370a23f..3cd7d87502fe 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index b9fcd846b259..a88bf0c841fa 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +