From 301ab5a5e7daac5c0e4189b8be4f5e2ad5a5ec50 Mon Sep 17 00:00:00 2001 From: Jocelyn Liu Date: Fri, 3 Jul 2015 12:39:23 +0800 Subject: [PATCH 01/22] Bug 1178654 - Fix the uuid length when parsing bluetooth low energy advertisement data. r=btian --- dom/bluetooth/bluetooth2/BluetoothDevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/bluetooth/bluetooth2/BluetoothDevice.cpp b/dom/bluetooth/bluetooth2/BluetoothDevice.cpp index 01547e024ff6..6127701a267e 100644 --- a/dom/bluetooth/bluetooth2/BluetoothDevice.cpp +++ b/dom/bluetooth/bluetooth2/BluetoothDevice.cpp @@ -382,7 +382,7 @@ BluetoothDevice::UpdatePropertiesFromAdvData(const nsTArray& aAdvData) dataLength -= 2; } - char uuidStr[36]; + char uuidStr[37]; // one more char to be null-terminated if (type == GAP_INCOMPLETE_UUID16 || type == GAP_COMPLETE_UUID16) { // Convert 16-bits UUID into string. snprintf(uuidStr, sizeof(uuidStr), From 45733c0be31f77bde521461ab90eb8e5ba60a08f Mon Sep 17 00:00:00 2001 From: Ben Tian Date: Thu, 2 Jul 2015 17:55:54 +0800 Subject: [PATCH 02/22] Bug 1179682 - Remove |mName| from BluetoothReplyRunnable, r=joliu --- dom/bluetooth/bluetooth2/BluetoothAdapter.cpp | 62 ++++++------------- dom/bluetooth/bluetooth2/BluetoothDevice.cpp | 15 ++--- dom/bluetooth/bluetooth2/BluetoothGatt.cpp | 32 +++------- .../BluetoothGattCharacteristic.cpp | 48 +++++--------- .../bluetooth2/BluetoothGattDescriptor.cpp | 11 +--- .../bluetooth2/BluetoothPairingHandle.cpp | 28 +++------ .../bluetooth2/BluetoothReplyRunnable.cpp | 9 +-- .../bluetooth2/BluetoothReplyRunnable.h | 7 +-- 8 files changed, 64 insertions(+), 148 deletions(-) diff --git a/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp b/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp index 19a41b7107da..fc495f2a2d5b 100644 --- a/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp +++ b/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp @@ -68,8 +68,7 @@ class StartDiscoveryTask final : public BluetoothReplyRunnable { public: StartDiscoveryTask(BluetoothAdapter* aAdapter, Promise* aPromise) - : BluetoothReplyRunnable(nullptr, aPromise, - NS_LITERAL_STRING("StartDiscovery")) + : BluetoothReplyRunnable(nullptr, aPromise) , mAdapter(aAdapter) { MOZ_ASSERT(aPromise); @@ -117,8 +116,7 @@ class StartLeScanTask final : public BluetoothReplyRunnable public: StartLeScanTask(BluetoothAdapter* aAdapter, Promise* aPromise, const nsTArray& aServiceUuids) - : BluetoothReplyRunnable(nullptr, aPromise, - NS_LITERAL_STRING("StartLeScan")) + : BluetoothReplyRunnable(nullptr, aPromise) , mAdapter(aAdapter) , mServiceUuids(aServiceUuids) { @@ -175,8 +173,7 @@ public: StopLeScanTask(BluetoothAdapter* aAdapter, Promise* aPromise, const nsAString& aScanUuid) - : BluetoothReplyRunnable(nullptr, aPromise, - NS_LITERAL_STRING("StopLeScan")) + : BluetoothReplyRunnable(nullptr, aPromise) , mAdapter(aAdapter) , mScanUuid(aScanUuid) { @@ -574,9 +571,7 @@ BluetoothAdapter::StartDiscovery(ErrorResult& aRv) } // Return BluetoothDiscoveryHandle in StartDiscoveryTask - nsRefPtr result = - new StartDiscoveryTask(this, promise); - bs->StartDiscoveryInternal(result); + bs->StartDiscoveryInternal(new StartDiscoveryTask(this, promise)); return promise.forget(); } @@ -606,11 +601,7 @@ BluetoothAdapter::StopDiscovery(ErrorResult& aRv) BluetoothService* bs = BluetoothService::Get(); BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("StopDiscovery")); - bs->StopDiscoveryInternal(result); + bs->StopDiscoveryInternal(new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } @@ -707,13 +698,10 @@ BluetoothAdapter::SetName(const nsAString& aName, ErrorResult& aRv) nsString name(aName); BluetoothNamedValue property(NS_LITERAL_STRING("Name"), BluetoothValue(name)); - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("SetName")); BT_ENSURE_TRUE_REJECT( - NS_SUCCEEDED(bs->SetProperty(BluetoothObjectType::TYPE_ADAPTER, - property, result)), + NS_SUCCEEDED( + bs->SetProperty(BluetoothObjectType::TYPE_ADAPTER, property, + new BluetoothVoidReplyRunnable(nullptr, promise))), promise, NS_ERROR_DOM_OPERATION_ERR); @@ -750,13 +738,10 @@ BluetoothAdapter::SetDiscoverable(bool aDiscoverable, ErrorResult& aRv) // Wrap property to set and runnable to handle result BluetoothNamedValue property(NS_LITERAL_STRING("Discoverable"), BluetoothValue(aDiscoverable)); - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("SetDiscoverable")); BT_ENSURE_TRUE_REJECT( - NS_SUCCEEDED(bs->SetProperty(BluetoothObjectType::TYPE_ADAPTER, - property, result)), + NS_SUCCEEDED( + bs->SetProperty(BluetoothObjectType::TYPE_ADAPTER, property, + new BluetoothVoidReplyRunnable(nullptr, promise))), promise, NS_ERROR_DOM_OPERATION_ERR); @@ -832,19 +817,12 @@ BluetoothAdapter::PairUnpair(bool aPair, const nsAString& aDeviceAddress, nsresult rv; if (aPair) { - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("Pair")); - rv = bs->CreatePairedDeviceInternal(aDeviceAddress, - kCreatePairedDeviceTimeout, - result); + rv = bs->CreatePairedDeviceInternal( + aDeviceAddress, kCreatePairedDeviceTimeout, + new BluetoothVoidReplyRunnable(nullptr, promise)); } else { - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("Unpair")); - rv = bs->RemoveDeviceInternal(aDeviceAddress, result); + rv = bs->RemoveDeviceInternal(aDeviceAddress, + new BluetoothVoidReplyRunnable(nullptr, promise)); } BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(rv), promise, NS_ERROR_DOM_OPERATION_ERR); @@ -891,9 +869,7 @@ BluetoothAdapter::Enable(ErrorResult& aRv) // Wrap runnable to handle result nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr, /* DOMRequest */ - promise, - NS_LITERAL_STRING("Enable")); + new BluetoothVoidReplyRunnable(nullptr, promise); if (NS_FAILED(bs->EnableDisable(true, result))) { // Restore adapter state and reject promise @@ -932,9 +908,7 @@ BluetoothAdapter::Disable(ErrorResult& aRv) // Wrap runnable to handle result nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr, /* DOMRequest */ - promise, - NS_LITERAL_STRING("Disable")); + new BluetoothVoidReplyRunnable(nullptr, promise); if (NS_FAILED(bs->EnableDisable(false, result))) { // Restore adapter state and reject promise diff --git a/dom/bluetooth/bluetooth2/BluetoothDevice.cpp b/dom/bluetooth/bluetooth2/BluetoothDevice.cpp index 6127701a267e..04e8b4c6185f 100644 --- a/dom/bluetooth/bluetooth2/BluetoothDevice.cpp +++ b/dom/bluetooth/bluetooth2/BluetoothDevice.cpp @@ -54,9 +54,8 @@ class FetchUuidsTask final : public BluetoothReplyRunnable { public: FetchUuidsTask(Promise* aPromise, - const nsAString& aName, BluetoothDevice* aDevice) - : BluetoothReplyRunnable(nullptr /* DOMRequest */, aPromise, aName) + : BluetoothReplyRunnable(nullptr, aPromise) , mDevice(aDevice) { MOZ_ASSERT(aPromise); @@ -185,16 +184,14 @@ BluetoothDevice::FetchUuids(ErrorResult& aRv) nsRefPtr promise = Promise::Create(global, aRv); NS_ENSURE_TRUE(!aRv.Failed(), nullptr); + // Ensure BluetoothService is available BluetoothService* bs = BluetoothService::Get(); BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = - new FetchUuidsTask(promise, - NS_LITERAL_STRING("FetchUuids"), - this); - - nsresult rv = bs->FetchUuidsInternal(mAddress, result); - BT_ENSURE_TRUE_REJECT(NS_SUCCEEDED(rv), promise, NS_ERROR_DOM_OPERATION_ERR); + BT_ENSURE_TRUE_REJECT( + NS_SUCCEEDED( + bs->FetchUuidsInternal(mAddress, new FetchUuidsTask(promise, this))), + promise, NS_ERROR_DOM_OPERATION_ERR); return promise.forget(); } diff --git a/dom/bluetooth/bluetooth2/BluetoothGatt.cpp b/dom/bluetooth/bluetooth2/BluetoothGatt.cpp index cf7b22c42897..1d37910bfccf 100644 --- a/dom/bluetooth/bluetooth2/BluetoothGatt.cpp +++ b/dom/bluetooth/bluetooth2/BluetoothGatt.cpp @@ -121,13 +121,8 @@ BluetoothGatt::Connect(ErrorResult& aRv) } UpdateConnectionState(BluetoothConnectionState::Connecting); - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("ConnectGattClient")); - bs->ConnectGattClientInternal(mAppUuid, - mDeviceAddr, - result); + bs->ConnectGattClientInternal( + mAppUuid, mDeviceAddr, new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } @@ -153,11 +148,8 @@ BluetoothGatt::Disconnect(ErrorResult& aRv) BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); UpdateConnectionState(BluetoothConnectionState::Disconnecting); - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("DisconnectGattClient")); - bs->DisconnectGattClientInternal(mAppUuid, mDeviceAddr, result); + bs->DisconnectGattClientInternal( + mAppUuid, mDeviceAddr, new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } @@ -166,8 +158,7 @@ class ReadRemoteRssiTask final : public BluetoothReplyRunnable { public: ReadRemoteRssiTask(Promise* aPromise) - : BluetoothReplyRunnable(nullptr, aPromise, - NS_LITERAL_STRING("GattClientReadRemoteRssi")) + : BluetoothReplyRunnable(nullptr, aPromise) { MOZ_ASSERT(aPromise); } @@ -205,9 +196,8 @@ BluetoothGatt::ReadRemoteRssi(ErrorResult& aRv) BluetoothService* bs = BluetoothService::Get(); BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = - new ReadRemoteRssiTask(promise); - bs->GattClientReadRemoteRssiInternal(mClientIf, mDeviceAddr, result); + bs->GattClientReadRemoteRssiInternal( + mClientIf, mDeviceAddr, new ReadRemoteRssiTask(promise)); return promise.forget(); } @@ -236,11 +226,9 @@ BluetoothGatt::DiscoverServices(ErrorResult& aRv) mDiscoveringServices = true; mServices.Clear(); BluetoothGattBinding::ClearCachedServicesValue(this); - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("DiscoverGattServices")); - bs->DiscoverGattServicesInternal(mAppUuid, result); + + bs->DiscoverGattServicesInternal( + mAppUuid, new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } diff --git a/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.cpp b/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.cpp index 11546d30a4c8..d9ff633bae62 100644 --- a/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.cpp +++ b/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.cpp @@ -99,15 +99,9 @@ BluetoothGattCharacteristic::StartNotifications(ErrorResult& aRv) BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); BT_ENSURE_TRUE_REJECT(mService, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = - new BluetoothVoidReplyRunnable( - nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("GattClientStartNotifications")); - bs->GattClientStartNotificationsInternal(mService->GetAppUuid(), - mService->GetServiceId(), - mCharId, - result); + bs->GattClientStartNotificationsInternal( + mService->GetAppUuid(), mService->GetServiceId(), mCharId, + new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } @@ -128,15 +122,9 @@ BluetoothGattCharacteristic::StopNotifications(ErrorResult& aRv) BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); BT_ENSURE_TRUE_REJECT(mService, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = - new BluetoothVoidReplyRunnable( - nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("GattClientStopNotifications")); - bs->GattClientStopNotificationsInternal(mService->GetAppUuid(), - mService->GetServiceId(), - mCharId, - result); + bs->GattClientStopNotificationsInternal( + mService->GetAppUuid(), mService->GetServiceId(), mCharId, + new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } @@ -212,9 +200,7 @@ class ReadValueTask final : public BluetoothReplyRunnable { public: ReadValueTask(BluetoothGattCharacteristic* aCharacteristic, Promise* aPromise) - : BluetoothReplyRunnable( - nullptr, aPromise, - NS_LITERAL_STRING("GattClientReadCharacteristicValue")) + : BluetoothReplyRunnable(nullptr, aPromise) , mCharacteristic(aCharacteristic) { MOZ_ASSERT(aCharacteristic); @@ -271,11 +257,9 @@ BluetoothGattCharacteristic::ReadValue(ErrorResult& aRv) BluetoothService* bs = BluetoothService::Get(); BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = new ReadValueTask(this, promise); - bs->GattClientReadCharacteristicValueInternal(mService->GetAppUuid(), - mService->GetServiceId(), - mCharId, - result); + bs->GattClientReadCharacteristicValueInternal( + mService->GetAppUuid(), mService->GetServiceId(), mCharId, + new ReadValueTask(this, promise)); return promise.forget(); } @@ -308,14 +292,10 @@ BluetoothGattCharacteristic::WriteValue(const ArrayBuffer& aValue, BluetoothService* bs = BluetoothService::Get(); BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = new BluetoothVoidReplyRunnable( - nullptr, promise, NS_LITERAL_STRING("GattClientWriteCharacteristicValue")); - bs->GattClientWriteCharacteristicValueInternal(mService->GetAppUuid(), - mService->GetServiceId(), - mCharId, - mWriteType, - value, - result); + bs->GattClientWriteCharacteristicValueInternal( + mService->GetAppUuid(), mService->GetServiceId(), + mCharId, mWriteType, value, + new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } diff --git a/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.cpp b/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.cpp index 95c3b26a533d..de7d33743bf9 100644 --- a/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.cpp +++ b/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.cpp @@ -122,9 +122,7 @@ class ReadValueTask final : public BluetoothReplyRunnable { public: ReadValueTask(BluetoothGattDescriptor* aDescriptor, Promise* aPromise) - : BluetoothReplyRunnable( - nullptr, aPromise, - NS_LITERAL_STRING("GattClientReadDescriptorValue")) + : BluetoothReplyRunnable(nullptr, aPromise) , mDescriptor(aDescriptor) { MOZ_ASSERT(aDescriptor); @@ -177,13 +175,12 @@ BluetoothGattDescriptor::ReadValue(ErrorResult& aRv) BluetoothService* bs = BluetoothService::Get(); BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = new ReadValueTask(this, promise); bs->GattClientReadDescriptorValueInternal( mCharacteristic->Service()->GetAppUuid(), mCharacteristic->Service()->GetServiceId(), mCharacteristic->GetCharacteristicId(), mDescriptorId, - result); + new ReadValueTask(this, promise)); return promise.forget(); } @@ -209,15 +206,13 @@ BluetoothGattDescriptor::WriteValue( BluetoothService* bs = BluetoothService::Get(); BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = new BluetoothVoidReplyRunnable( - nullptr, promise, NS_LITERAL_STRING("GattClientWriteDescriptorValue")); bs->GattClientWriteDescriptorValueInternal( mCharacteristic->Service()->GetAppUuid(), mCharacteristic->Service()->GetServiceId(), mCharacteristic->GetCharacteristicId(), mDescriptorId, value, - result); + new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } diff --git a/dom/bluetooth/bluetooth2/BluetoothPairingHandle.cpp b/dom/bluetooth/bluetooth2/BluetoothPairingHandle.cpp index 6a7bab7caa7b..d8bfc48633eb 100644 --- a/dom/bluetooth/bluetooth2/BluetoothPairingHandle.cpp +++ b/dom/bluetooth/bluetooth2/BluetoothPairingHandle.cpp @@ -82,11 +82,8 @@ BluetoothPairingHandle::SetPinCode(const nsAString& aPinCode, ErrorResult& aRv) BluetoothService* bs = BluetoothService::Get(); BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("SetPinCode")); - bs->PinReplyInternal(mDeviceAddress, true /* accept */, aPinCode, result); + bs->PinReplyInternal(mDeviceAddress, true /* accept */, aPinCode, + new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } @@ -116,12 +113,8 @@ BluetoothPairingHandle::Accept(ErrorResult& aRv) promise, NS_ERROR_DOM_OPERATION_ERR); - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("Accept")); - bs->SspReplyInternal( - mDeviceAddress, variant, true /* aAccept */, result); + bs->SspReplyInternal(mDeviceAddress, variant, true /* aAccept */, + new BluetoothVoidReplyRunnable(nullptr, promise)); return promise.forget(); } @@ -141,22 +134,17 @@ BluetoothPairingHandle::Reject(ErrorResult& aRv) BluetoothService* bs = BluetoothService::Get(); BT_ENSURE_TRUE_REJECT(bs, promise, NS_ERROR_NOT_AVAILABLE); - nsRefPtr result = - new BluetoothVoidReplyRunnable(nullptr /* DOMRequest */, - promise, - NS_LITERAL_STRING("Reject")); - if (mType.EqualsLiteral(PAIRING_REQ_TYPE_ENTERPINCODE)) { // Pin request - bs->PinReplyInternal( - mDeviceAddress, false /* aAccept */, EmptyString(), result); + bs->PinReplyInternal(mDeviceAddress, false /* aAccept */, EmptyString(), + new BluetoothVoidReplyRunnable(nullptr, promise)); } else { // Ssp request BluetoothSspVariant variant; BT_ENSURE_TRUE_REJECT(GetSspVariant(variant), promise, NS_ERROR_DOM_OPERATION_ERR); - bs->SspReplyInternal( - mDeviceAddress, variant, false /* aAccept */, result); + bs->SspReplyInternal(mDeviceAddress, variant, false /* aAccept */, + new BluetoothVoidReplyRunnable(nullptr, promise)); } return promise.forget(); diff --git a/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.cpp b/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.cpp index e47fda293c82..4e5f9be9d9d4 100644 --- a/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.cpp +++ b/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.cpp @@ -17,12 +17,10 @@ using namespace mozilla::dom; USING_BLUETOOTH_NAMESPACE BluetoothReplyRunnable::BluetoothReplyRunnable(nsIDOMDOMRequest* aReq, - Promise* aPromise, - const nsAString& aName) + Promise* aPromise) : mDOMRequest(aReq) , mPromise(aPromise) , mErrorStatus(STATUS_FAIL) - , mName(aName) {} void @@ -121,9 +119,8 @@ BluetoothReplyRunnable::Run() } BluetoothVoidReplyRunnable::BluetoothVoidReplyRunnable(nsIDOMDOMRequest* aReq, - Promise* aPromise, - const nsAString& aName) - : BluetoothReplyRunnable(aReq, aPromise, aName) + Promise* aPromise) + : BluetoothReplyRunnable(aReq, aPromise) {} BluetoothVoidReplyRunnable::~BluetoothVoidReplyRunnable() diff --git a/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.h b/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.h index 8793d24cec57..4ef5ddce3b71 100644 --- a/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.h +++ b/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.h @@ -30,8 +30,7 @@ public: NS_DECL_NSIRUNNABLE BluetoothReplyRunnable(nsIDOMDOMRequest* aReq, - Promise* aPromise = nullptr, - const nsAString& aName = EmptyString()); + Promise* aPromise = nullptr); void SetReply(BluetoothReply* aReply); @@ -71,15 +70,13 @@ private: BluetoothStatus mErrorStatus; nsString mErrorString; - nsString mName; // for debugging }; class BluetoothVoidReplyRunnable : public BluetoothReplyRunnable { public: BluetoothVoidReplyRunnable(nsIDOMDOMRequest* aReq, - Promise* aPromise = nullptr, - const nsAString& aName = EmptyString()); + Promise* aPromise = nullptr); ~BluetoothVoidReplyRunnable(); protected: From 40234535864658e6538874bba42aa9ee16ae542b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 01:20:15 -0700 Subject: [PATCH 03/22] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1f9a196bc581 Author: Timothy Guan-tin Chien Desc: Merge pull request #30790 from timdream/keyboard-deactive-imengine Bug 1177052 - deactivate IMEngine first before getText() on inputcontext, r=rudyl ======== https://hg.mozilla.org/integration/gaia-central/rev/f5f186a87d1d Author: Timothy Guan-tin Chien Desc: Bug 1177052 - deactivate IMEngine first before getText() on inputcontext ======== https://hg.mozilla.org/integration/gaia-central/rev/5d42efb35a1d Author: Yi-Fan Liao Desc: Merge pull request #30788 from begeeben/1168039_fade_out Bug 1168039 - [Stingray][Dashboard] Fade out non-focus components when expanding widgets, r=rexboy ======== https://hg.mozilla.org/integration/gaia-central/rev/eeb8fb9cdd51 Author: Yi-Fan Liao Desc: Bug 1168039 - [Stingray][Dashboard] Fade out non-focus components when expanding widgets * Add fade out animations for widgets and the digital clock. --- 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 f277d3955d47..de6a36291868 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "c2438f746a3236398735202c0d79fab28cd019ae", + "git_revision": "fc707726edf0559c50c6569522202e347b2602b3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "0312e33fddf5c92fad3933fd16f39075d6e6190f", + "revision": "1f9a196bc5816b3a9089b6aba8be6807076c9038", "repo_path": "integration/gaia-central" } From 8278008fff1273dfb9885b642a4dd5eed2c6fcd3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 01:22:15 -0700 Subject: [PATCH 04/22] 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 9ccd5e3ef94c..e98fe4bbe358 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 33e4e69bb03f..42d530068c85 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 91e1511589ee..c7f6c1993917 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 53c4304c17f5..9609309c5f6e 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 fdb37a84fa7d..d8b772ba1e8a 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 ab272619cdf6..e3448f30b5be 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 91e1511589ee..c7f6c1993917 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 d7fff5405697..d61a979423b7 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 41c71dac95ea..cdde6848b1f0 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 9f368064f03e..18a7f487ef91 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 183732178424d5e6355ff7b75f5136df9c24262a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 02:45:36 -0700 Subject: [PATCH 05/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c0959afcae41 Author: Etienne Segonzac Desc: Merge pull request #30756 from etiennesegonzac/bug-1147688 Bug 1147688 - Put the UtilityTray on top of fullscreen browser tabs.r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/c80a4a867160 Author: Etienne Segonzac Desc: Bug 1147688 - Put the UtilityTray on top of fullscreen browser tabs. r=gmarty --- 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 de6a36291868..cd123575e8fe 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "fc707726edf0559c50c6569522202e347b2602b3", + "git_revision": "25198330aaadf48cd939955118a4a887e173fff7", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "1f9a196bc5816b3a9089b6aba8be6807076c9038", + "revision": "c0959afcae41f53564268a66ceb48e5be2748415", "repo_path": "integration/gaia-central" } From 844e6a3d2ae48002ea18d432202e0f3490bab160 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 02:47:40 -0700 Subject: [PATCH 06/22] 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 e98fe4bbe358..ca51f50543e4 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 42d530068c85..b787795f9b12 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 c7f6c1993917..c711b99e9d4d 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 9609309c5f6e..6c7a25538129 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 d8b772ba1e8a..4ebb3692754a 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 e3448f30b5be..25b9675de606 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 c7f6c1993917..c711b99e9d4d 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 d61a979423b7..867c3a8c2d41 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 cdde6848b1f0..b429386a7957 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 18a7f487ef91..ec492f9f032b 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From aae768a68e439582280fedcd6e0fe7c8b0de8daa Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 03:55:07 -0700 Subject: [PATCH 07/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a266947180fb Author: Yi-Fan Liao Desc: Merge pull request #30789 from begeeben/1169137_setinterval_clock Bug 1169137 - [Stingray] setInterval clock implementation sometimes sometimes skips a couple seconds, r=rexboy ======== https://hg.mozilla.org/integration/gaia-central/rev/b374ac5fbf5d Author: Yi-Fan Liao Desc: Bug 1169137 - [Stingray] setInterval clock implementation sometimes skips a couple seconds * Change setInterval to time adjusted setTimeout. --- 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 cd123575e8fe..a6baac3e93c9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "25198330aaadf48cd939955118a4a887e173fff7", + "git_revision": "6af34d696e233fd4374475aa27969f90d586d1f7", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "c0959afcae41f53564268a66ceb48e5be2748415", + "revision": "a266947180fb4859e8089ce2a6c17b40a9ec6d00", "repo_path": "integration/gaia-central" } From 52449f11888802a5441b9f43d9e6ca95805d6287 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 03:57:08 -0700 Subject: [PATCH 08/22] 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 ca51f50543e4..24545e3f3576 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 b787795f9b12..9f165fbb8b92 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 c711b99e9d4d..db4f5c796003 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 6c7a25538129..3589d1d6fda4 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 4ebb3692754a..6359b4677943 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 25b9675de606..edb74fdf8860 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 c711b99e9d4d..db4f5c796003 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 867c3a8c2d41..17ee08a8cea7 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 b429386a7957..ec216fcbda0d 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 ec492f9f032b..97a539257215 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 14d5e5f7fc8d9dd440d8763c7168ce877bde40c5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 05:35:36 -0700 Subject: [PATCH 09/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d7f25cd3d888 Author: Fernando Campo Desc: Merge pull request #30692 from fcampo/fb_out_ftu_1175491 Bug 1175491 - Eliminate FB toggle in FTU until new version of FB integration arrives (r=sfoster,f=borjasalguero) ======== https://hg.mozilla.org/integration/gaia-central/rev/364e869926be Author: Fernando Campo Desc: Bug 1175491 - Eliminate FB from FTU (r=sfoster) --- 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 a6baac3e93c9..27763c8b763f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "6af34d696e233fd4374475aa27969f90d586d1f7", + "git_revision": "a85322eb06b0787b0b8b2b34da1e4ce047c9ec92", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "a266947180fb4859e8089ce2a6c17b40a9ec6d00", + "revision": "d7f25cd3d888bdd8c76883aec35ffb0985e4cd1e", "repo_path": "integration/gaia-central" } From 03b38a8ea645e5d3cd8b2cfdcd280ee844973890 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 05:37:36 -0700 Subject: [PATCH 10/22] 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 24545e3f3576..9d3d2adfb414 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 9f165fbb8b92..dd51185706c7 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 db4f5c796003..761df04450e9 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 3589d1d6fda4..840f9a67adc6 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 6359b4677943..ba812e67a7f2 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 edb74fdf8860..530f76d0a4d1 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 db4f5c796003..761df04450e9 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 17ee08a8cea7..21fddb428fad 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 ec216fcbda0d..3f6b86e6ef36 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 97a539257215..509d022c4390 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 7438fb772d3f825419c55e5c6124979da5984363 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 08:40:39 -0700 Subject: [PATCH 11/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/665bcd40b8f5 Author: Chris Lord Desc: Merge pull request #30821 from Cwiiis/bug1178483-dark-shadow-on-lockscreen-input-window Bug 1178483 - Don't show shadow on lockscreenInputWindow. r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/f4f9729d3180 Author: Chris Lord Desc: Bug 1178483 - Don't show shadow on lockscreenInputWindow. r=etienne --- 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 27763c8b763f..4d432cf4bddd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "a85322eb06b0787b0b8b2b34da1e4ce047c9ec92", + "git_revision": "f5b2036bf9e36183d658e994b85df22a76137ac0", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "d7f25cd3d888bdd8c76883aec35ffb0985e4cd1e", + "revision": "665bcd40b8f567508d17e278ff3914c248e33c5e", "repo_path": "integration/gaia-central" } From 09646cac5cf00383a4bd6f837d130127fb807544 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 08:43:05 -0700 Subject: [PATCH 12/22] 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 9d3d2adfb414..419994ffab77 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 dd51185706c7..4196f19849f3 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 761df04450e9..85aa8d51e7c2 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 840f9a67adc6..eec269d95088 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 ba812e67a7f2..711c050817f7 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 530f76d0a4d1..2ee5008075fe 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 761df04450e9..85aa8d51e7c2 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 21fddb428fad..edfa07d9f1e8 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 3f6b86e6ef36..814331c684d3 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 509d022c4390..fb20b40197d9 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 85c6a6cd5bcf059ac6cd382322ad48aadcf0338f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 09:26:35 -0700 Subject: [PATCH 13/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3b7aa1e99881 Author: Martijn Desc: Merge pull request #30810 from mwargers/1179891 Bug 1179891 - Fix for failure in test_ftu_skip_tour.py, with message: No languages listed on screen ======== https://hg.mozilla.org/integration/gaia-central/rev/f9372223db72 Author: Martijn Wargers Desc: Bug 1179891 - Fix for failure in test_ftu_skip_tour.py, with message: No languages listed on screen --- 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 4d432cf4bddd..a721fcee1dc5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "f5b2036bf9e36183d658e994b85df22a76137ac0", + "git_revision": "d2706da8d541e8d6efd28bac2052402e46035daf", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "665bcd40b8f567508d17e278ff3914c248e33c5e", + "revision": "3b7aa1e99881cbadffee06949e17404c97a74812", "repo_path": "integration/gaia-central" } From bd7c2c726d80e8b04e14703193b881d74ef88564 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 09:28:35 -0700 Subject: [PATCH 14/22] 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 419994ffab77..f8a24a9cb88e 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 4196f19849f3..dfaa7ebf8597 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 85aa8d51e7c2..66804c3f09b3 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 eec269d95088..a060b1edf676 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 711c050817f7..25bda0d6af5d 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 2ee5008075fe..6d7b666108e0 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 85aa8d51e7c2..66804c3f09b3 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 edfa07d9f1e8..2dce1ec68b4e 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 814331c684d3..2038adf01df8 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 fb20b40197d9..f4c1689a0dd5 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 7f09d8e33cc70ca905a1b00b3d728c404c568c7f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 10:17:15 -0700 Subject: [PATCH 15/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5cce1cdde65c Author: Martijn Desc: Merge pull request #30812 from mwargers/1180062 Bug 1180062 - Another failure in test_cost_control_data_alert_mobile.py ======== https://hg.mozilla.org/integration/gaia-central/rev/537bdf8ea54d Author: Martijn Wargers Desc: Bug 1180062 - Another failure in test_cost_control_data_alert_mobile.py --- 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 a721fcee1dc5..baa3f3a6cf0c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "d2706da8d541e8d6efd28bac2052402e46035daf", + "git_revision": "01649f2a1ed3ebcc59468c02df61ecf2594eaeeb", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "3b7aa1e99881cbadffee06949e17404c97a74812", + "revision": "5cce1cdde65ce86d1fae8ed677d577cf087e9160", "repo_path": "integration/gaia-central" } From 2774492771b816268be0bb3c94ee9903c451b71e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 10:19:15 -0700 Subject: [PATCH 16/22] 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 f8a24a9cb88e..e1f287e3b182 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 dfaa7ebf8597..df1a619a1180 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 66804c3f09b3..96201746b39c 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 a060b1edf676..71635ac76299 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 25bda0d6af5d..71fbec8dcab5 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 6d7b666108e0..28299f20dded 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 66804c3f09b3..96201746b39c 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 2dce1ec68b4e..90566823d3af 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 2038adf01df8..04b0d11fc1f0 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 f4c1689a0dd5..081e36dc189d 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 4ce64810c7a8b1e723c307ec16f41ab8b25cf9d6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 12:20:35 -0700 Subject: [PATCH 17/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/21fa00fa9ee4 Author: Ben Francis Desc: Merge pull request #30665 from sfoster/icons-bug-1174813 Bug 1174813 - Handle site icons in web manifest. r=etienne, r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/6ee14047339b Author: Sam Foster Desc: Bug 1174813 - Handle site icons in web manifest. r=etienne, r=benfrancis * Remove icons handling from WebManifestHelper * New processRawManifest method on WMH to sanitize and resolve icon URLs * Combined iconURLForSize and IconsHelper's implementation to pick nearest icon to given size * Updated consumers to use IconsHelper's methods for choosing an icon * Signature change to getBestIconFromWebManifest as WMH has already resolved urls so no need to pass in manifestURL * getSiteIconUrl (AppWindow) and setSiteIcon (AppChrome) + associated tests by gmarty * Updated unit tests --- 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 baa3f3a6cf0c..a2fb7e5ecd29 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "01649f2a1ed3ebcc59468c02df61ecf2594eaeeb", + "git_revision": "83927a21d3ad081e9ffb0c853ee52890d85dc37d", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "5cce1cdde65ce86d1fae8ed677d577cf087e9160", + "revision": "21fa00fa9ee49f2e8ea4b833094afe71e369c729", "repo_path": "integration/gaia-central" } From ae139452c836815010c25e2b0e3ec2fb82b4a97f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 12:22:35 -0700 Subject: [PATCH 18/22] 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 e1f287e3b182..a346791fc65c 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 df1a619a1180..06950fa88268 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 96201746b39c..92c86799d1e5 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 71635ac76299..9d4a146e19d8 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 71fbec8dcab5..c2281688b547 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 28299f20dded..57acf795e6b6 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 96201746b39c..92c86799d1e5 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 90566823d3af..c5b2e1ef8b8d 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 04b0d11fc1f0..f9ee0fd09690 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 081e36dc189d..7286723111a7 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 8d47f4cade0cc31c70106bdd731f7b6973c10b31 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 14:55:15 -0700 Subject: [PATCH 19/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/124b9ca77fcc Author: Martijn Desc: Merge pull request #30818 from mwargers/1180170 Bug 1180170 - Failure in test_cost_control_ftu.py, locators need to be updated ======== https://hg.mozilla.org/integration/gaia-central/rev/49b7abb20167 Author: Martijn Wargers Desc: Bug 1180170 - Failure in test_cost_control_ftu.py, locators need to be updated --- 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 a2fb7e5ecd29..e79bc81b86de 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "83927a21d3ad081e9ffb0c853ee52890d85dc37d", + "git_revision": "99b1adc278b9eca33d9b18b0bda4119578f92270", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "21fa00fa9ee49f2e8ea4b833094afe71e369c729", + "revision": "124b9ca77fcc9f565e02813fe1d19fd794b6b7c3", "repo_path": "integration/gaia-central" } From a20246f2661e90983b9786aab1e158d2403962cc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 14:57:18 -0700 Subject: [PATCH 20/22] 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 a346791fc65c..affa3b8856cd 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 06950fa88268..99ee01a0a7f7 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 92c86799d1e5..30af246730b4 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 9d4a146e19d8..e9c35e079a21 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 c2281688b547..22e83fd82b8c 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 57acf795e6b6..1d3b41ab3ca6 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 92c86799d1e5..30af246730b4 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 c5b2e1ef8b8d..517bc9bcd499 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 f9ee0fd09690..b82f6dee16ec 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 7286723111a7..424581235702 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 4ab011d0dca5df232970e9192df57c40d6cd7672 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 15:30:21 -0700 Subject: [PATCH 21/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/22c58f4fec82 Author: Kevin Grandon Desc: Merge pull request #30823 from mwargers/1179267 Bug 1179267 - test_ftu_skip_tour.py: Timed out after 10.1 seconds with message: Send Data UI state should match initial internal state ======== https://hg.mozilla.org/integration/gaia-central/rev/01724511a51b Author: Martijn Wargers Desc: Bug 1179267 - test_ftu_skip_tour.py: Timed out after 10.1 seconds with message: Send Data UI state should match initial internal state --- 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 e79bc81b86de..aa96490b86f2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "99b1adc278b9eca33d9b18b0bda4119578f92270", + "git_revision": "75071a1117605a7ac79c51025caf6ffcfc4dfa95", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "124b9ca77fcc9f565e02813fe1d19fd794b6b7c3", + "revision": "22c58f4fec82075c7110bbc59ca7f6aad0a232a8", "repo_path": "integration/gaia-central" } From 25ba68a07c2b271b9dbd0c7236c2a252739e95d4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 3 Jul 2015 15:32:20 -0700 Subject: [PATCH 22/22] 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 affa3b8856cd..612954488114 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 99ee01a0a7f7..642ca7bcdade 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 30af246730b4..12db2709a7ba 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 e9c35e079a21..e9545031f2e3 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 22e83fd82b8c..905bb14e728b 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 1d3b41ab3ca6..98ef91831d65 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 30af246730b4..12db2709a7ba 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 517bc9bcd499..e3083afb58a9 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 b82f6dee16ec..aa18b7a8aead 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 424581235702..18ae696ffdf6 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +