From 0dc9c10b211d15e441d7e344efad7cf6a57bb3f1 Mon Sep 17 00:00:00 2001 From: Ben Tian Date: Tue, 3 Mar 2015 13:24:49 +0800 Subject: [PATCH 01/48] Bug 1133655 - Replace |DispatchBluetoothReply| with |DispatchReplySuccess| and |DispatchReplyError|, f=jocelyn, f=jaliu, r=shuang --- dom/bluetooth2/BluetoothProfileController.cpp | 14 +- dom/bluetooth2/BluetoothUtils.cpp | 77 ++++---- dom/bluetooth2/BluetoothUtils.h | 76 +++++--- .../bluedroid/BluetoothGattManager.cpp | 70 +++---- .../bluedroid/BluetoothServiceBluedroid.cpp | 171 ++++++------------ .../bluedroid/BluetoothServiceBluedroid.h | 3 - dom/bluetooth2/bluez/BluetoothDBusService.cpp | 12 ++ dom/bluetooth2/bluez/BluetoothHfpManager.cpp | 8 +- 8 files changed, 197 insertions(+), 234 deletions(-) diff --git a/dom/bluetooth2/BluetoothProfileController.cpp b/dom/bluetooth2/BluetoothProfileController.cpp index c9be3fe18433..a939a653908b 100644 --- a/dom/bluetooth2/BluetoothProfileController.cpp +++ b/dom/bluetooth2/BluetoothProfileController.cpp @@ -115,8 +115,7 @@ BluetoothProfileController::AddProfileWithServiceClass( profile = BluetoothHidManager::Get(); break; default: - DispatchBluetoothReply(mRunnable, BluetoothValue(), - NS_LITERAL_STRING(ERR_UNKNOWN_PROFILE)); + DispatchReplyError(mRunnable, NS_LITERAL_STRING(ERR_UNKNOWN_PROFILE)); mCallback(); return; } @@ -129,8 +128,7 @@ BluetoothProfileController::AddProfile(BluetoothProfileManagerBase* aProfile, bool aCheckConnected) { if (!aProfile) { - DispatchBluetoothReply(mRunnable, BluetoothValue(), - NS_LITERAL_STRING(ERR_NO_AVAILABLE_RESOURCE)); + DispatchReplyError(mRunnable, NS_LITERAL_STRING(ERR_NO_AVAILABLE_RESOURCE)); mCallback(); return; } @@ -255,13 +253,11 @@ BluetoothProfileController::EndSession() // The action has completed, so the DOM request should be replied then invoke // the callback. if (mSuccess) { - DispatchBluetoothReply(mRunnable, BluetoothValue(true), EmptyString()); + DispatchReplySuccess(mRunnable); } else if (mConnect) { - DispatchBluetoothReply(mRunnable, BluetoothValue(true), - NS_LITERAL_STRING(ERR_CONNECTION_FAILED)); + DispatchReplyError(mRunnable, NS_LITERAL_STRING(ERR_CONNECTION_FAILED)); } else { - DispatchBluetoothReply(mRunnable, BluetoothValue(true), - NS_LITERAL_STRING(ERR_DISCONNECTION_FAILED)); + DispatchReplyError(mRunnable, NS_LITERAL_STRING(ERR_DISCONNECTION_FAILED)); } mCallback(); diff --git a/dom/bluetooth2/BluetoothUtils.cpp b/dom/bluetooth2/BluetoothUtils.cpp index 810189fcbfce..dbf450570a37 100644 --- a/dom/bluetooth2/BluetoothUtils.cpp +++ b/dom/bluetooth2/BluetoothUtils.cpp @@ -64,6 +64,9 @@ StringToUuid(const char* aString, BluetoothUuid& aUuid) memcpy(&aUuid.mUuid[14], &uuid5, sizeof(uint16_t)); } +/** + * |SetJsObject| is an internal function used by |BroadcastSystemMessage| only + */ bool SetJsObject(JSContext* aContext, const BluetoothValue& aValue, @@ -119,7 +122,7 @@ BroadcastSystemMessage(const nsAString& aType, const BluetoothValue& aData) { mozilla::AutoSafeJSContext cx; - NS_ASSERTION(!::JS_IsExceptionPending(cx), + MOZ_ASSERT(!::JS_IsExceptionPending(cx), "Shouldn't get here when an exception is pending!"); nsCOMPtr systemMessenger = @@ -160,7 +163,7 @@ BroadcastSystemMessage(const nsAString& aType, const InfallibleTArray& aData) { mozilla::AutoSafeJSContext cx; - NS_ASSERTION(!::JS_IsExceptionPending(cx), + MOZ_ASSERT(!::JS_IsExceptionPending(cx), "Shouldn't get here when an exception is pending!"); JS::Rooted obj(cx, JS_NewPlainObject(cx)); @@ -186,44 +189,50 @@ BroadcastSystemMessage(const nsAString& aType, } void -DispatchBluetoothReply(BluetoothReplyRunnable* aRunnable, - const BluetoothValue& aValue, - const nsAString& aErrorStr) +DispatchReplySuccess(BluetoothReplyRunnable* aRunnable) { - // Reply will be deleted by the runnable after running on main thread - BluetoothReply* reply; - if (!aErrorStr.IsEmpty()) { - nsString err(aErrorStr); - reply = new BluetoothReply(BluetoothReplyError(STATUS_FAIL, err)); - } else { - MOZ_ASSERT(aValue.type() != BluetoothValue::T__None); - reply = new BluetoothReply(BluetoothReplySuccess(aValue)); - } - - aRunnable->SetReply(reply); - if (NS_FAILED(NS_DispatchToMainThread(aRunnable))) { - BT_WARNING("Failed to dispatch to main thread!"); - } + DispatchReplySuccess(aRunnable, BluetoothValue(true)); } void -DispatchBluetoothReply(BluetoothReplyRunnable* aRunnable, - const BluetoothValue& aValue, - const enum BluetoothStatus aStatusCode) +DispatchReplySuccess(BluetoothReplyRunnable* aRunnable, + const BluetoothValue& aValue) { - // Reply will be deleted by the runnable after running on main thread - BluetoothReply* reply; - if (aStatusCode != STATUS_SUCCESS) { - reply = new BluetoothReply(BluetoothReplyError(aStatusCode, EmptyString())); - } else { - MOZ_ASSERT(aValue.type() != BluetoothValue::T__None); - reply = new BluetoothReply(BluetoothReplySuccess(aValue)); - } + MOZ_ASSERT(aRunnable); + MOZ_ASSERT(aValue.type() != BluetoothValue::T__None); - aRunnable->SetReply(reply); - if (NS_FAILED(NS_DispatchToMainThread(aRunnable))) { - BT_WARNING("Failed to dispatch to main thread!"); - } + BluetoothReply* reply = new BluetoothReply(BluetoothReplySuccess(aValue)); + + aRunnable->SetReply(reply); // runnable will delete reply after Run() + NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(aRunnable))); +} + +void +DispatchReplyError(BluetoothReplyRunnable* aRunnable, + const nsAString& aErrorStr) +{ + MOZ_ASSERT(aRunnable); + MOZ_ASSERT(!aErrorStr.IsEmpty()); + + BluetoothReply* reply = + new BluetoothReply(BluetoothReplyError(STATUS_FAIL, nsString(aErrorStr))); + + aRunnable->SetReply(reply); // runnable will delete reply after Run() + NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(aRunnable))); +} + +void +DispatchReplyError(BluetoothReplyRunnable* aRunnable, + const enum BluetoothStatus aStatus) +{ + MOZ_ASSERT(aRunnable); + MOZ_ASSERT(aStatus != STATUS_SUCCESS); + + BluetoothReply* reply = + new BluetoothReply(BluetoothReplyError(aStatus, EmptyString())); + + aRunnable->SetReply(reply); // runnable will delete reply after Run() + NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(aRunnable))); } void diff --git a/dom/bluetooth2/BluetoothUtils.h b/dom/bluetooth2/BluetoothUtils.h index ff60b9afb924..c293c350002b 100644 --- a/dom/bluetooth2/BluetoothUtils.h +++ b/dom/bluetooth2/BluetoothUtils.h @@ -13,9 +13,18 @@ BEGIN_BLUETOOTH_NAMESPACE class BluetoothNamedValue; -class BluetoothValue; class BluetoothReplyRunnable; +class BluetoothValue; +// +// BluetoothUuid <-> uuid string conversion +// + +/** + * Convert BluetoothUuid object to xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx uuid string. + * This utility function is used by gecko internal only to convert BluetoothUuid + * created by bluetooth stack to uuid string representation. + */ void UuidToString(const BluetoothUuid& aUuid, nsAString& aString); @@ -27,10 +36,9 @@ UuidToString(const BluetoothUuid& aUuid, nsAString& aString); void StringToUuid(const char* aString, BluetoothUuid& aUuid); -bool -SetJsObject(JSContext* aContext, - const BluetoothValue& aValue, - JS::Handle aObj); +// +// Broadcast system message +// bool BroadcastSystemMessage(const nsAString& aType, @@ -40,41 +48,59 @@ bool BroadcastSystemMessage(const nsAString& aType, const InfallibleTArray& aData); +// +// Dispatch bluetooth reply to main thread +// + /** - * Dispatch BluetoothReply to main thread. The reply contains an error string - * if the request fails. + * Dispatch successful bluetooth reply with NO value to reply request. + * + * @param aRunnable the runnable to reply bluetooth request. + */ +void +DispatchReplySuccess(BluetoothReplyRunnable* aRunnable); + +/** + * Dispatch successful bluetooth reply with value to reply request. + * + * @param aRunnable the runnable to reply bluetooth request. + * @param aValue the BluetoothValue to reply successful request. + */ +void +DispatchReplySuccess(BluetoothReplyRunnable* aRunnable, + const BluetoothValue& aValue); + +/** + * Dispatch failed bluetooth reply with error string. * * This function is for methods returning DOMRequest. If |aErrorStr| is not * empty, the DOMRequest property 'error.name' would be updated to |aErrorStr| * before callback function 'onerror' is fired. * + * NOTE: For methods returning Promise, |aErrorStr| would be ignored and only + * STATUS_FAIL is returned in BluetoothReplyRunnable. + * * @param aRunnable the runnable to reply bluetooth request. - * @param aValue the BluetoothValue used to reply successful request. - * @param aErrorStr the error string used to reply failed request. + * @param aErrorStr the error string to reply failed request. */ void -DispatchBluetoothReply(BluetoothReplyRunnable* aRunnable, - const BluetoothValue& aValue, - const nsAString& aErrorStr); +DispatchReplyError(BluetoothReplyRunnable* aRunnable, + const nsAString& aErrorStr); /** - * Dispatch BluetoothReply to main thread. The reply contains an error string - * if the request fails. + * Dispatch failed bluetooth reply with error status. * - * This function is for methods returning Promise. If |aStatusCode| is not - * STATUS_SUCCESS, the Promise would reject with an Exception object with - * nsError associated with |aStatusCode|. The name and messege of Exception - * (defined in dom/base/domerr.msg) are filled automatically during promise - * rejection. + * This function is for methods returning Promise. The Promise would reject + * with an Exception object that carries nsError associated with |aStatus|. + * The name and messege of Exception (defined in dom/base/domerr.msg) are + * filled automatically during promise rejection. * - * @param aRunnable the runnable to reply bluetooth request. - * @param aValue the BluetoothValue to reply successful request. - * @param aStatusCode the error status to reply failed request. + * @param aRunnable the runnable to reply bluetooth request. + * @param aStatus the error status to reply failed request. */ void -DispatchBluetoothReply(BluetoothReplyRunnable* aRunnable, - const BluetoothValue& aValue, - const enum BluetoothStatus aStatusCode); +DispatchReplyError(BluetoothReplyRunnable* aRunnable, + const enum BluetoothStatus aStatus); void DispatchStatusChangedEvent(const nsAString& aType, diff --git a/dom/bluetooth2/bluedroid/BluetoothGattManager.cpp b/dom/bluetooth2/bluedroid/BluetoothGattManager.cpp index e5a45388bd85..3e07abfddaf4 100644 --- a/dom/bluetooth2/bluedroid/BluetoothGattManager.cpp +++ b/dom/bluetooth2/bluedroid/BluetoothGattManager.cpp @@ -20,9 +20,8 @@ #define ENSURE_GATT_CLIENT_INTF_IS_READY_VOID(runnable) \ do { \ if (!sBluetoothGattInterface) { \ - NS_NAMED_LITERAL_STRING(errorStr, \ - "BluetoothGattClientInterface is not ready"); \ - DispatchBluetoothReply(runnable, BluetoothValue(), errorStr); \ + DispatchReplyError(runnable, \ + NS_LITERAL_STRING("BluetoothGattClientInterface is not ready")); \ return; \ } \ } while(0) @@ -270,10 +269,8 @@ public: // Reject the connect request if (mClient->mConnectRunnable) { - NS_NAMED_LITERAL_STRING(errorStr, "Register GATT client failed"); - DispatchBluetoothReply(mClient->mConnectRunnable, - BluetoothValue(), - errorStr); + DispatchReplyError(mClient->mConnectRunnable, + NS_LITERAL_STRING("Register GATT client failed")); mClient->mConnectRunnable = nullptr; } @@ -308,9 +305,7 @@ public: bs->DistributeSignal(signal); // Resolve the unregister request - DispatchBluetoothReply(mClient->mUnregisterClientRunnable, - BluetoothValue(true), - EmptyString()); + DispatchReplySuccess(mClient->mUnregisterClientRunnable); mClient->mUnregisterClientRunnable = nullptr; sClients->RemoveElement(mClient); @@ -323,10 +318,8 @@ public: MOZ_ASSERT(mClient->mUnregisterClientRunnable); // Reject the unregister request - NS_NAMED_LITERAL_STRING(errorStr, "Unregister GATT client failed"); - DispatchBluetoothReply(mClient->mUnregisterClientRunnable, - BluetoothValue(), - errorStr); + DispatchReplyError(mClient->mUnregisterClientRunnable, + NS_LITERAL_STRING("Unregister GATT client failed")); mClient->mUnregisterClientRunnable = nullptr; } @@ -348,10 +341,8 @@ BluetoothGattManager::UnregisterClient(int aClientIf, // Reject the unregister request if the client is not found if (index == sClients->NoIndex) { - NS_NAMED_LITERAL_STRING(errorStr, "Unregister GATT client failed"); - DispatchBluetoothReply(aRunnable, - BluetoothValue(), - errorStr); + DispatchReplyError(aRunnable, + NS_LITERAL_STRING("Unregister GATT client failed")); return; } @@ -390,10 +381,8 @@ public: bs->DistributeSignal(signal); // Reject the connect request - NS_NAMED_LITERAL_STRING(errorStr, "Connect failed"); - DispatchBluetoothReply(mClient->mConnectRunnable, - BluetoothValue(), - errorStr); + DispatchReplyError(mClient->mConnectRunnable, + NS_LITERAL_STRING("Connect failed")); mClient->mConnectRunnable = nullptr; } @@ -462,10 +451,8 @@ public: bs->DistributeSignal(signal); // Reject the disconnect request - NS_NAMED_LITERAL_STRING(errorStr, "Disconnect failed"); - DispatchBluetoothReply(mClient->mDisconnectRunnable, - BluetoothValue(), - errorStr); + DispatchReplyError(mClient->mDisconnectRunnable, + NS_LITERAL_STRING("Disconnect failed")); mClient->mDisconnectRunnable = nullptr; } @@ -487,8 +474,7 @@ BluetoothGattManager::Disconnect(const nsAString& aAppUuid, // Reject the disconnect request if the client is not found if (index == sClients->NoIndex) { - NS_NAMED_LITERAL_STRING(errorStr, "Disconnect failed"); - DispatchBluetoothReply(aRunnable, BluetoothValue(), errorStr); + DispatchReplyError(aRunnable, NS_LITERAL_STRING("Disconnect failed")); return; } @@ -536,11 +522,9 @@ BluetoothGattManager::RegisterClientNotification(int aStatus, // Reject the connect request if (client->mConnectRunnable) { - NS_NAMED_LITERAL_STRING(errorStr, - "Connect failed due to registration failed"); - DispatchBluetoothReply(client->mConnectRunnable, - BluetoothValue(), - errorStr); + DispatchReplyError(client->mConnectRunnable, + NS_LITERAL_STRING( + "Connect failed due to registration failed")); client->mConnectRunnable = nullptr; } @@ -600,10 +584,8 @@ BluetoothGattManager::ConnectNotification(int aConnId, // Reject the connect request if (client->mConnectRunnable) { - NS_NAMED_LITERAL_STRING(errorStr, "Connect failed"); - DispatchBluetoothReply(client->mConnectRunnable, - BluetoothValue(), - errorStr); + DispatchReplyError(client->mConnectRunnable, + NS_LITERAL_STRING("Connect failed")); client->mConnectRunnable = nullptr; } @@ -621,9 +603,7 @@ BluetoothGattManager::ConnectNotification(int aConnId, // Resolve the connect request if (client->mConnectRunnable) { - DispatchBluetoothReply(client->mConnectRunnable, - BluetoothValue(true), - EmptyString()); + DispatchReplySuccess(client->mConnectRunnable); client->mConnectRunnable = nullptr; } } @@ -655,10 +635,8 @@ BluetoothGattManager::DisconnectNotification(int aConnId, // Reject the disconnect request if (client->mDisconnectRunnable) { - NS_NAMED_LITERAL_STRING(errorStr, "Disconnect failed"); - DispatchBluetoothReply(client->mDisconnectRunnable, - BluetoothValue(), - errorStr); + DispatchReplyError(client->mDisconnectRunnable, + NS_LITERAL_STRING("Disconnect failed")); client->mDisconnectRunnable = nullptr; } @@ -676,9 +654,7 @@ BluetoothGattManager::DisconnectNotification(int aConnId, // Resolve the disconnect request if (client->mDisconnectRunnable) { - DispatchBluetoothReply(client->mDisconnectRunnable, - BluetoothValue(true), - EmptyString()); + DispatchReplySuccess(client->mDisconnectRunnable); client->mDisconnectRunnable = nullptr; } } diff --git a/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp b/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp index 20154bf757c6..6b85d131cf44 100644 --- a/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp +++ b/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp @@ -33,15 +33,11 @@ #include "mozilla/StaticPtr.h" #include "mozilla/unused.h" -#define ERR_SET_PROPERTY "SetPropertyError" -#define ERR_START_BLUETOOTH "StartBluetoothError" -#define ERR_STOP_BLUETOOTH "StopBluetoothError" - #define ENSURE_BLUETOOTH_IS_READY(runnable, result) \ do { \ if (!sBtInterface || !IsEnabled()) { \ - NS_NAMED_LITERAL_STRING(errorStr, "Bluetooth is not ready"); \ - DispatchBluetoothReply(runnable, BluetoothValue(), errorStr); \ + DispatchReplyError(runnable, \ + NS_LITERAL_STRING("Bluetooth is not ready")); \ return result; \ } \ } while(0) @@ -49,8 +45,8 @@ #define ENSURE_BLUETOOTH_IS_READY_VOID(runnable) \ do { \ if (!sBtInterface || !IsEnabled()) { \ - NS_NAMED_LITERAL_STRING(errorStr, "Bluetooth is not ready"); \ - DispatchBluetoothReply(runnable, BluetoothValue(), errorStr); \ + DispatchReplyError(runnable, \ + NS_LITERAL_STRING("Bluetooth is not ready")); \ return; \ } \ } while(0) @@ -58,8 +54,8 @@ #define ENSURE_GATT_MGR_IS_READY_VOID(gatt, runnable) \ do { \ if (!gatt) { \ - NS_NAMED_LITERAL_STRING(replyError, "GattManager is not ready"); \ - DispatchBluetoothReply(runnable, BluetoothValue(), replyError); \ + DispatchReplyError(runnable, \ + NS_LITERAL_STRING("GattManager is not ready")); \ return; \ } \ } while(0) @@ -270,36 +266,6 @@ BluetoothServiceBluedroid::StopGonkBluetooth() return NS_OK; } -void -BluetoothServiceBluedroid::ReplyStatusError( - BluetoothReplyRunnable* aBluetoothReplyRunnable, - BluetoothStatus aStatusCode, const nsAString& aCustomMsg) -{ - MOZ_ASSERT(aBluetoothReplyRunnable, "Reply runnable is nullptr"); - - BT_LOGR("error code(%d)", aStatusCode); - - nsAutoString replyError; - replyError.Assign(aCustomMsg); - - if (aStatusCode == STATUS_BUSY) { - replyError.AppendLiteral(":BT_STATUS_BUSY"); - } else if (aStatusCode == STATUS_NOT_READY) { - replyError.AppendLiteral(":BT_STATUS_NOT_READY"); - } else if (aStatusCode == STATUS_DONE) { - replyError.AppendLiteral(":BT_STATUS_DONE"); - } else if (aStatusCode == STATUS_AUTH_FAILURE) { - replyError.AppendLiteral(":BT_STATUS_AUTH_FAILURE"); - } else if (aStatusCode == STATUS_RMT_DEV_DOWN) { - replyError.AppendLiteral(":BT_STATUS_RMT_DEV_DOWN"); - } else if (aStatusCode == STATUS_FAIL) { - replyError.AppendLiteral(":BT_STATUS_FAIL"); - } - - DispatchBluetoothReply(aBluetoothReplyRunnable, BluetoothValue(true), - replyError); -} - /** * Member functions */ @@ -331,8 +297,7 @@ BluetoothServiceBluedroid::StartInternal(BluetoothReplyRunnable* aRunnable) // Reject Promise if(aRunnable) { - DispatchBluetoothReply(aRunnable, BluetoothValue(), - NS_LITERAL_STRING(ERR_START_BLUETOOTH)); + DispatchReplyError(aRunnable, NS_LITERAL_STRING("StartBluetoothError")); sChangeAdapterStateRunnableArray.RemoveElement(aRunnable); } @@ -389,8 +354,7 @@ BluetoothServiceBluedroid::StopInternal(BluetoothReplyRunnable* aRunnable) // Reject Promise if(aRunnable) { - DispatchBluetoothReply(aRunnable, BluetoothValue(), - NS_LITERAL_STRING(ERR_STOP_BLUETOOTH)); + DispatchReplyError(aRunnable, NS_LITERAL_STRING("StopBluetoothError")); sChangeAdapterStateRunnableArray.RemoveElement(aRunnable); } @@ -440,7 +404,7 @@ BluetoothServiceBluedroid::GetAdaptersInternal( "Adapter", properties); } - DispatchBluetoothReply(aRunnable, adaptersProperties, EmptyString()); + DispatchReplySuccess(aRunnable, adaptersProperties); return NS_OK; } @@ -463,8 +427,7 @@ public: /* dispatch result after final pending operation */ if (--sRequestedDeviceCountArray[0] == 0) { if (!sGetDeviceRunnableArray.IsEmpty()) { - DispatchBluetoothReply( - sGetDeviceRunnableArray[0], sRemoteDevicesPack, + DispatchReplyError(sGetDeviceRunnableArray[0], NS_LITERAL_STRING("GetRemoteDeviceProperties failed")); sGetDeviceRunnableArray.RemoveElementAt(0); } @@ -489,9 +452,7 @@ BluetoothServiceBluedroid::GetConnectedDevicePropertiesInternal( BluetoothProfileManagerBase* profile = BluetoothUuidHelper::GetBluetoothProfileManager(aServiceUuid); if (!profile) { - InfallibleTArray emptyArr; - DispatchBluetoothReply(aRunnable, emptyArr, - NS_LITERAL_STRING(ERR_UNKNOWN_PROFILE)); + DispatchReplyError(aRunnable, NS_LITERAL_STRING(ERR_UNKNOWN_PROFILE)); return NS_OK; } @@ -505,7 +466,7 @@ BluetoothServiceBluedroid::GetConnectedDevicePropertiesInternal( int requestedDeviceCount = deviceAddresses.Length(); if (requestedDeviceCount == 0) { InfallibleTArray emptyArr; - DispatchBluetoothReply(aRunnable, emptyArr, EmptyString()); + DispatchReplySuccess(aRunnable, emptyArr); return NS_OK; } @@ -531,7 +492,7 @@ BluetoothServiceBluedroid::GetPairedDevicePropertiesInternal( int requestedDeviceCount = aDeviceAddress.Length(); if (requestedDeviceCount == 0) { - DispatchBluetoothReply(aRunnable, BluetoothValue(true), EmptyString()); + DispatchReplySuccess(aRunnable); return NS_OK; } @@ -556,7 +517,7 @@ public: { MOZ_ASSERT(NS_IsMainThread()); sChangeDiscoveryRunnableArray.RemoveElement(mRunnable); - ReplyStatusError(mRunnable, aStatus, NS_LITERAL_STRING("StartDiscovery")); + DispatchReplyError(mRunnable, aStatus); } private: @@ -589,7 +550,7 @@ public: { MOZ_ASSERT(NS_IsMainThread()); sChangeDiscoveryRunnableArray.RemoveElement(mRunnable); - ReplyStatusError(mRunnable, aStatus, NS_LITERAL_STRING("StopDiscovery")); + DispatchReplyError(mRunnable, aStatus); } private: @@ -622,7 +583,7 @@ public: { MOZ_ASSERT(NS_IsMainThread()); sFetchUuidsRunnableArray.RemoveElement(mRunnable); - ReplyStatusError(mRunnable, aStatus, NS_LITERAL_STRING("FetchUuids")); + DispatchReplyError(mRunnable, aStatus); } private: @@ -665,7 +626,7 @@ public: { MOZ_ASSERT(NS_IsMainThread()); sSetPropertyRunnableArray.RemoveElement(mRunnable); - ReplyStatusError(mRunnable, aStatus, NS_LITERAL_STRING("SetProperty")); + DispatchReplyError(mRunnable, aStatus); } private: BluetoothReplyRunnable* mRunnable; @@ -718,7 +679,7 @@ public: void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE { sBondingRunnableArray.RemoveElement(mRunnable); - ReplyStatusError(mRunnable, aStatus, NS_LITERAL_STRING("CreatedPairedDevice")); + DispatchReplyError(mRunnable, aStatus); } private: @@ -754,7 +715,7 @@ public: void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE { sUnbondingRunnableArray.RemoveElement(mRunnable); - ReplyStatusError(mRunnable, aStatus, NS_LITERAL_STRING("RemoveDevice")); + DispatchReplyError(mRunnable, aStatus); } private: @@ -787,12 +748,12 @@ public: void PinReply() MOZ_OVERRIDE { - DispatchBluetoothReply(mRunnable, BluetoothValue(true), EmptyString()); + DispatchReplySuccess(mRunnable); } void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE { - ReplyStatusError(mRunnable, aStatus, NS_LITERAL_STRING("SetPinCode")); + DispatchReplyError(mRunnable, aStatus); } private: @@ -830,13 +791,12 @@ public: void SspReply() MOZ_OVERRIDE { - DispatchBluetoothReply(mRunnable, BluetoothValue(true), EmptyString()); + DispatchReplySuccess(mRunnable); } void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE { - ReplyStatusError(mRunnable, aStatus, - NS_LITERAL_STRING("SetPairingConfirmation")); + DispatchReplyError(mRunnable, aStatus); } private: @@ -933,12 +893,12 @@ BluetoothServiceBluedroid::SendFile(const nsAString& aDeviceAddress, // has been determined when calling 'Connect()'. Nevertheless, keep // it for future use. BluetoothOppManager* opp = BluetoothOppManager::Get(); - nsAutoString errorStr; if (!opp || !opp->SendFile(aDeviceAddress, aBlobParent)) { - errorStr.AssignLiteral("Calling SendFile() failed"); + DispatchReplyError(aRunnable, NS_LITERAL_STRING("SendFile failed")); + return; } - DispatchBluetoothReply(aRunnable, BluetoothValue(true), errorStr); + DispatchReplySuccess(aRunnable); } void @@ -953,12 +913,12 @@ BluetoothServiceBluedroid::SendFile(const nsAString& aDeviceAddress, // has been determined when calling 'Connect()'. Nevertheless, keep // it for future use. BluetoothOppManager* opp = BluetoothOppManager::Get(); - nsAutoString errorStr; if (!opp || !opp->SendFile(aDeviceAddress, aBlob)) { - errorStr.AssignLiteral("Calling SendFile() failed"); + DispatchReplyError(aRunnable, NS_LITERAL_STRING("SendFile failed")); + return; } - DispatchBluetoothReply(aRunnable, BluetoothValue(true), errorStr); + DispatchReplySuccess(aRunnable); } void @@ -974,10 +934,11 @@ BluetoothServiceBluedroid::StopSendingFile(const nsAString& aDeviceAddress, BluetoothOppManager* opp = BluetoothOppManager::Get(); nsAutoString errorStr; if (!opp || !opp->StopSendingFile()) { - errorStr.AssignLiteral("Calling StopSendingFile() failed"); + DispatchReplyError(aRunnable, NS_LITERAL_STRING("StopSendingFile failed")); + return; } - DispatchBluetoothReply(aRunnable, BluetoothValue(true), errorStr); + DispatchReplySuccess(aRunnable); } void @@ -985,7 +946,7 @@ BluetoothServiceBluedroid::ConfirmReceivingFile( const nsAString& aDeviceAddress, bool aConfirm, BluetoothReplyRunnable* aRunnable) { - MOZ_ASSERT(NS_IsMainThread(), "Must be called from main thread!"); + MOZ_ASSERT(NS_IsMainThread()); // Currently we only support one device sending one file at a time, // so we don't need aDeviceAddress here because the target device @@ -994,10 +955,12 @@ BluetoothServiceBluedroid::ConfirmReceivingFile( BluetoothOppManager* opp = BluetoothOppManager::Get(); nsAutoString errorStr; if (!opp || !opp->ConfirmReceivingFile(aConfirm)) { - errorStr.AssignLiteral("Calling ConfirmReceivingFile() failed"); + DispatchReplyError(aRunnable, + NS_LITERAL_STRING("ConfirmReceivingFile failed")); + return; } - DispatchBluetoothReply(aRunnable, BluetoothValue(true), errorStr); + DispatchReplySuccess(aRunnable); } void @@ -1007,12 +970,11 @@ BluetoothServiceBluedroid::ConnectSco(BluetoothReplyRunnable* aRunnable) BluetoothHfpManager* hfp = BluetoothHfpManager::Get(); if (!hfp || !hfp->ConnectSco()) { - NS_NAMED_LITERAL_STRING(replyError, "Calling ConnectSco() failed"); - DispatchBluetoothReply(aRunnable, BluetoothValue(), replyError); + DispatchReplyError(aRunnable, NS_LITERAL_STRING("ConnectSco failed")); return; } - DispatchBluetoothReply(aRunnable, BluetoothValue(true), EmptyString()); + DispatchReplySuccess(aRunnable); } void @@ -1022,12 +984,11 @@ BluetoothServiceBluedroid::DisconnectSco(BluetoothReplyRunnable* aRunnable) BluetoothHfpManager* hfp = BluetoothHfpManager::Get(); if (!hfp || !hfp->DisconnectSco()) { - NS_NAMED_LITERAL_STRING(replyError, "Calling DisconnectSco() failed"); - DispatchBluetoothReply(aRunnable, BluetoothValue(), replyError); + DispatchReplyError(aRunnable, NS_LITERAL_STRING("DisconnectSco failed")); return; } - DispatchBluetoothReply(aRunnable, BluetoothValue(true), EmptyString()); + DispatchReplySuccess(aRunnable); } void @@ -1037,12 +998,11 @@ BluetoothServiceBluedroid::IsScoConnected(BluetoothReplyRunnable* aRunnable) BluetoothHfpManager* hfp = BluetoothHfpManager::Get(); if (!hfp) { - NS_NAMED_LITERAL_STRING(replyError, "Fail to get BluetoothHfpManager"); - DispatchBluetoothReply(aRunnable, BluetoothValue(), replyError); + DispatchReplyError(aRunnable, NS_LITERAL_STRING("IsScoConnected failed")); return; } - DispatchBluetoothReply(aRunnable, hfp->IsScoConnected(), EmptyString()); + DispatchReplySuccess(aRunnable, BluetoothValue(hfp->IsScoConnected())); } void @@ -1059,7 +1019,7 @@ BluetoothServiceBluedroid::SendMetaData(const nsAString& aTitle, a2dp->UpdateMetaData(aTitle, aArtist, aAlbum, aMediaNumber, aTotalMediaCount, aDuration); } - DispatchBluetoothReply(aRunnable, BluetoothValue(true), EmptyString()); + DispatchReplySuccess(aRunnable); } void @@ -1074,7 +1034,7 @@ BluetoothServiceBluedroid::SendPlayStatus( PlayStatusStringToControlPlayStatus(aPlayStatus); a2dp->UpdatePlayStatus(aDuration, aPosition, playStatus); } - DispatchBluetoothReply(aRunnable, BluetoothValue(true), EmptyString()); + DispatchReplySuccess(aRunnable); } void @@ -1281,7 +1241,7 @@ BluetoothServiceBluedroid::AdapterStateChangedNotification(bool aState) sBondingRunnableArray.Clear(); sUnbondingRunnableArray.Clear(); - // Bluetooth scan mode is SCAN_MODE_CONNECTABLE by default, i.e., It should + // Bluetooth scan mode is SCAN_MODE_CONNECTABLE by default, i.e., it should // be connectable and non-discoverable. NS_ENSURE_TRUE_VOID(sBtInterface); sBtInterface->SetAdapterProperty( @@ -1297,9 +1257,7 @@ BluetoothServiceBluedroid::AdapterStateChangedNotification(bool aState) // Resolve promise if existed if (!sChangeAdapterStateRunnableArray.IsEmpty()) { - DispatchBluetoothReply(sChangeAdapterStateRunnableArray[0], - BluetoothValue(true), EmptyString()); - + DispatchReplySuccess(sChangeAdapterStateRunnableArray[0]); sChangeAdapterStateRunnableArray.RemoveElementAt(0); } } @@ -1369,8 +1327,7 @@ BluetoothServiceBluedroid::AdapterPropertiesNotification( // Send reply for SetProperty if (!sSetPropertyRunnableArray.IsEmpty()) { - DispatchBluetoothReply(sSetPropertyRunnableArray[0], - BluetoothValue(true), EmptyString()); + DispatchReplySuccess(sSetPropertyRunnableArray[0]); sSetPropertyRunnableArray.RemoveElementAt(0); } } @@ -1435,9 +1392,9 @@ BluetoothServiceBluedroid::RemoteDevicePropertiesNotification( // (2) distribute the signal, and finally // (3) send any pending Bluetooth replies. // - // |DispatchBluetoothReply| creates its own internal runnable, which is + // |DispatchReplySuccess| creates its own internal runnable, which is // always run after we completed the current method. This means that we - // can exchange |DistributeBluetoothReply| with other operations without + // can exchange |DispatchReplySuccess| with other operations without // changing the order of (1,2) and (3). // Update to registered BluetoothDevice objects @@ -1447,9 +1404,8 @@ BluetoothServiceBluedroid::RemoteDevicePropertiesNotification( // FetchUuids task if (!sFetchUuidsRunnableArray.IsEmpty()) { // propertiesArray contains Address and Uuids only - DispatchBluetoothReply(sFetchUuidsRunnableArray[0], - propertiesArray[1].value() /* Uuids */, - EmptyString()); + DispatchReplySuccess(sFetchUuidsRunnableArray[0], + propertiesArray[1].value()); /* Uuids */ sFetchUuidsRunnableArray.RemoveElementAt(0); DistributeSignal(signal); return; @@ -1469,8 +1425,7 @@ BluetoothServiceBluedroid::RemoteDevicePropertiesNotification( if (--sRequestedDeviceCountArray[0] == 0) { if (!sGetDeviceRunnableArray.IsEmpty()) { - DispatchBluetoothReply(sGetDeviceRunnableArray[0], - sRemoteDevicesPack, EmptyString()); + DispatchReplySuccess(sGetDeviceRunnableArray[0], sRemoteDevicesPack); sGetDeviceRunnableArray.RemoveElementAt(0); } @@ -1550,9 +1505,7 @@ BluetoothServiceBluedroid::DiscoveryStateChangedNotification(bool aState) // Reply that Promise is resolved if (!sChangeDiscoveryRunnableArray.IsEmpty()) { - DispatchBluetoothReply(sChangeDiscoveryRunnableArray[0], - BluetoothValue(true), EmptyString()); - + DispatchReplySuccess(sChangeDiscoveryRunnableArray[0]); sChangeDiscoveryRunnableArray.RemoveElementAt(0); } } @@ -1670,25 +1623,21 @@ BluetoothServiceBluedroid::BondStateChangedNotification( if (aStatus == STATUS_SUCCESS) { // Resolve existing pair/unpair promise when pair/unpair succeeded if (bonded && !sBondingRunnableArray.IsEmpty()) { - DispatchBluetoothReply(sBondingRunnableArray[0], - BluetoothValue(true), EmptyString()); + DispatchReplySuccess(sBondingRunnableArray[0]); sBondingRunnableArray.RemoveElementAt(0); } else if (!bonded && !sUnbondingRunnableArray.IsEmpty()) { - DispatchBluetoothReply(sUnbondingRunnableArray[0], - BluetoothValue(true), EmptyString()); + DispatchReplySuccess(sUnbondingRunnableArray[0]); sUnbondingRunnableArray.RemoveElementAt(0); } } else { // Reject existing pair/unpair promise when pair/unpair failed if (!bonded && !sBondingRunnableArray.IsEmpty()) { - DispatchBluetoothReply(sBondingRunnableArray[0], - BluetoothValue(), - NS_LITERAL_STRING("Pair Error")); + DispatchReplyError(sBondingRunnableArray[0], + NS_LITERAL_STRING("Pair failed")); sBondingRunnableArray.RemoveElementAt(0); } else if (bonded && !sUnbondingRunnableArray.IsEmpty()) { - DispatchBluetoothReply(sUnbondingRunnableArray[0], - BluetoothValue(), - NS_LITERAL_STRING("Unpair Error")); + DispatchReplyError(sUnbondingRunnableArray[0], + NS_LITERAL_STRING("Unpair failed")); sUnbondingRunnableArray.RemoveElementAt(0); } } diff --git a/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.h b/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.h index 5933ecb3ad9e..dd77a5a6c4e1 100644 --- a/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.h +++ b/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.h @@ -240,9 +240,6 @@ protected: static void NextBluetoothProfileController(); static ControlPlayStatus PlayStatusStringToControlPlayStatus( const nsAString& aPlayStatus); - static void ReplyStatusError(BluetoothReplyRunnable* aReplyRunnable, - BluetoothStatus aStatusCode, - const nsAString& aCustomMsg); }; END_BLUETOOTH_NAMESPACE diff --git a/dom/bluetooth2/bluez/BluetoothDBusService.cpp b/dom/bluetooth2/bluez/BluetoothDBusService.cpp index 781e1c94bed0..390a9c7b9320 100644 --- a/dom/bluetooth2/bluez/BluetoothDBusService.cpp +++ b/dom/bluetooth2/bluez/BluetoothDBusService.cpp @@ -408,6 +408,18 @@ DispatchToBtThread(nsIRunnable* aRunnable) return sBluetoothThread->Dispatch(aRunnable, NS_DISPATCH_NORMAL); } +static void +DispatchBluetoothReply(BluetoothReplyRunnable* aRunnable, + const BluetoothValue& aValue, + const nsAString& aErrorStr) +{ + if (!aErrorStr.IsEmpty()) { + DispatchReplyError(aRunnable, aErrorStr); + } else { + DispatchReplySuccess(aRunnable, aValue); + } +} + BluetoothDBusService::BluetoothDBusService() { sGetPropertyMonitor = new Monitor("BluetoothService.sGetPropertyMonitor"); diff --git a/dom/bluetooth2/bluez/BluetoothHfpManager.cpp b/dom/bluetooth2/bluez/BluetoothHfpManager.cpp index 7c96f4c5677f..fea26b99b943 100644 --- a/dom/bluetooth2/bluez/BluetoothHfpManager.cpp +++ b/dom/bluetooth2/bluez/BluetoothHfpManager.cpp @@ -1885,8 +1885,7 @@ BluetoothHfpManager::OnScoConnectSuccess() { // For active connection request, we need to reply the DOMRequest if (mScoRunnable) { - DispatchBluetoothReply(mScoRunnable, - BluetoothValue(true), EmptyString()); + DispatchReplySuccess(mScoRunnable); mScoRunnable = nullptr; } @@ -1900,9 +1899,8 @@ void BluetoothHfpManager::OnScoConnectError() { if (mScoRunnable) { - NS_NAMED_LITERAL_STRING(replyError, "Failed to create SCO socket!"); - DispatchBluetoothReply(mScoRunnable, BluetoothValue(), replyError); - + DispatchReplyError(mScoRunnable, + NS_LITERAL_STRING("Failed to create SCO socket!")); mScoRunnable = nullptr; } From 223557a3dfca25a579e394d7ae978f77123f1a17 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 2 Mar 2015 23:45:28 -0800 Subject: [PATCH 02/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6e537eb74395 Author: Kevin Grandon Desc: Merge pull request #28221 from FunkTron/Bug1069221 Bug 1069221 - Fixed visibility for screen readers while warnings are displayed ======== https://hg.mozilla.org/integration/gaia-central/rev/ff888fc1a3a5 Author: Ross Desc: Bug 1069221 - Fixed discrete visibility for screen readers while warnings are displayed --- 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 a3fe325b06a7..894d6091416d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "4352d56f8c79a51eb44e43658472236a38d6f1d8", + "git_revision": "620210e07a4634008a33fe62f817f508258bd2c3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "a414e3396742a2e623feda0ba9ed654f6cd525d5", + "revision": "6e537eb74395ac3c52bcc5bcb3d32a5b94241d85", "repo_path": "integration/gaia-central" } From fdda4ebfe2a918b3f36965f33ed6c960cfa65a17 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 2 Mar 2015 23:47:57 -0800 Subject: [PATCH 03/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 232783c0788f..d8c7c95ca75f 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 8f9b5788ec23..a123fdcf2166 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 47f57443bb96..a77efe20fdf4 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 ac98f35caa0d..9c3eb485caa0 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 9fa7237952db..b9822dfba74e 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 8f9b5788ec23..a123fdcf2166 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 d9c794cb70b8..d63e151e5661 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 639686b7dcf8..bd99284dac7e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ae6fd8458d57..45d2ff12f1b7 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 dc927ebad636..ad8580af8759 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From eb597148dcb79181a50ed32734efbccb59f66192 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 00:55:25 -0800 Subject: [PATCH 04/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9b96bf2d208c Author: Borja Salguero Desc: Merge pull request #28415 from borjasalguero/fix_mobileid_dialog Bug 1136175 - [System] Trusted UI css properties are breaking MobileID d... ======== https://hg.mozilla.org/integration/gaia-central/rev/d7de4c6f2658 Author: borjasalguero Desc: Bug 1136175 - [System] Trusted UI css properties are breaking MobileID dialog r=alive --- 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 894d6091416d..ef257d319ccd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "620210e07a4634008a33fe62f817f508258bd2c3", + "git_revision": "af660476962f0b1aa67af16cf8cc3c0d7533a9d5", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "6e537eb74395ac3c52bcc5bcb3d32a5b94241d85", + "revision": "9b96bf2d208c9047a52cd8c395d72b61af9c7c0f", "repo_path": "integration/gaia-central" } From 6ec01911118d920ddadee3e44566570f51b89645 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 00:57:59 -0800 Subject: [PATCH 05/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d8c7c95ca75f..cab99dd65de3 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 a123fdcf2166..45c1d03e583f 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 a77efe20fdf4..906658a26480 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 9c3eb485caa0..60785502beb0 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 b9822dfba74e..c5b4b4327c17 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 a123fdcf2166..45c1d03e583f 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 d63e151e5661..7393f09543fa 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index bd99284dac7e..a425891dc3f5 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 45d2ff12f1b7..e3bc9b9b8c58 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 ad8580af8759..f05ea1e0ab44 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 84fa7aad1df475c394b9cfa3c9bb6bd4cb66f4f3 Mon Sep 17 00:00:00 2001 From: Jamin Liu Date: Tue, 3 Mar 2015 17:13:12 +0800 Subject: [PATCH 06/48] Bug 1127665 - Append name of paired device to 'DevicePaired' and 'PropertyChanged' BT signal. r=btian --- dom/bluetooth2/BluetoothAdapter.cpp | 5 ++- dom/bluetooth2/BluetoothCommon.h | 8 ++++ .../bluedroid/BluetoothServiceBluedroid.cpp | 40 +++++++++++++------ 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dom/bluetooth2/BluetoothAdapter.cpp b/dom/bluetooth2/BluetoothAdapter.cpp index c5f1ad58b02c..dbd9511d1274 100644 --- a/dom/bluetooth2/BluetoothAdapter.cpp +++ b/dom/bluetooth2/BluetoothAdapter.cpp @@ -893,9 +893,10 @@ BluetoothAdapter::HandleDevicePaired(const BluetoothValue& aValue) const InfallibleTArray& arr = aValue.get_ArrayOfBluetoothNamedValue(); - MOZ_ASSERT(arr.Length() == 2 && + MOZ_ASSERT(arr.Length() == 3 && arr[0].value().type() == BluetoothValue::TnsString && // Address - arr[1].value().type() == BluetoothValue::Tbool); // Paired + arr[1].value().type() == BluetoothValue::Tbool && // Paired + arr[2].value().type() == BluetoothValue::TnsString); // Name MOZ_ASSERT(!arr[0].value().get_nsString().IsEmpty() && arr[1].value().get_bool()); diff --git a/dom/bluetooth2/BluetoothCommon.h b/dom/bluetooth2/BluetoothCommon.h index afaa04606ca6..8439caaf0a0d 100644 --- a/dom/bluetooth2/BluetoothCommon.h +++ b/dom/bluetooth2/BluetoothCommon.h @@ -84,6 +84,14 @@ extern bool gBluetoothDebugFlag; array.AppendElement(BluetoothNamedValue(NS_LITERAL_STRING(name), \ BluetoothValue(value))) +/** + * Wrap literal name and value into a BluetoothNamedValue + * and insert it to the array. + */ +#define BT_INSERT_NAMED_VALUE(array, index, name, value) \ + array.InsertElementAt(index, BluetoothNamedValue(NS_LITERAL_STRING(name), \ + BluetoothValue(value))) + /** * Ensure success of system message broadcast with void return. */ diff --git a/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp b/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp index 6b85d131cf44..3521b4936f44 100644 --- a/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp +++ b/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp @@ -32,6 +32,7 @@ #include "mozilla/StaticMutex.h" #include "mozilla/StaticPtr.h" #include "mozilla/unused.h" +#include "nsDataHashtable.h" #define ENSURE_BLUETOOTH_IS_READY(runnable, result) \ do { \ @@ -72,6 +73,12 @@ static bool sAdapterEnabled(false); // InfallibleTArray is an alias for nsTArray. static InfallibleTArray sAdapterBondedAddressArray; +// Use a static hash table to keep the name of remote device during the pairing +// procedure. In this manner, BT service and adapter can get the name of paired +// device name when bond state changed. +// The hash Key is BD address, the Value is remote BD name. +static nsDataHashtable sPairingNameTable; + static BluetoothInterface* sBtInterface; static nsTArray > sControllerArray; static InfallibleTArray sRemoteDevicesPack; @@ -1211,10 +1218,6 @@ BluetoothServiceBluedroid::AdapterStateChangedNotification(bool aState) sAdapterDiscovering = false; BT_APPEND_NAMED_VALUE(props, "Discovering", false); } - if (!sAdapterBondedAddressArray.IsEmpty()) { - BT_APPEND_NAMED_VALUE(props, "PairedDevices", - InfallibleTArray()); - } BluetoothSignal signal(NS_LITERAL_STRING("PropertyChanged"), NS_LITERAL_STRING(KEY_ADAPTER), props); @@ -1240,6 +1243,7 @@ BluetoothServiceBluedroid::AdapterStateChangedNotification(bool aState) sFetchUuidsRunnableArray.Clear(); sBondingRunnableArray.Clear(); sUnbondingRunnableArray.Clear(); + sPairingNameTable.Clear(); // Bluetooth scan mode is SCAN_MODE_CONNECTABLE by default, i.e., it should // be connectable and non-discoverable. @@ -1304,10 +1308,7 @@ BluetoothServiceBluedroid::AdapterPropertiesNotification( // Whenever reloading paired devices, force refresh sAdapterBondedAddressArray.Clear(); - - for (size_t index = 0; index < p.mStringArray.Length(); index++) { - sAdapterBondedAddressArray.AppendElement(p.mStringArray[index]); - } + sAdapterBondedAddressArray.AppendElements(p.mStringArray); BT_APPEND_NAMED_VALUE(propertiesArray, "PairedDevices", sAdapterBondedAddressArray); @@ -1525,6 +1526,8 @@ BluetoothServiceBluedroid::PinRequestNotification(const nsAString& aRemoteBdAddr BT_APPEND_NAMED_VALUE(propertiesArray, "type", NS_LITERAL_STRING(PAIRING_REQ_TYPE_ENTERPINCODE)); + sPairingNameTable.Put(nsString(aRemoteBdAddr), nsString(aBdName)); + DistributeSignal(BluetoothSignal(NS_LITERAL_STRING("PairingRequest"), NS_LITERAL_STRING(KEY_PAIRING_LISTENER), BluetoothValue(propertiesArray))); @@ -1571,6 +1574,8 @@ BluetoothServiceBluedroid::SspRequestNotification( BT_APPEND_NAMED_VALUE(propertiesArray, "passkey", passkey); BT_APPEND_NAMED_VALUE(propertiesArray, "type", pairingType); + sPairingNameTable.Put(nsString(aRemoteBdAddr), nsString(aBdName)); + DistributeSignal(BluetoothSignal(NS_LITERAL_STRING("PairingRequest"), NS_LITERAL_STRING(KEY_PAIRING_LISTENER), BluetoothValue(propertiesArray))); @@ -1604,14 +1609,25 @@ BluetoothServiceBluedroid::BondStateChangedNotification( InfallibleTArray propertiesArray; BT_APPEND_NAMED_VALUE(propertiesArray, "Paired", bonded); + // Retrieve device name from hash table of pairing device name. + nsString deviceName = EmptyString(); + bool nameExists = sPairingNameTable.Get(aRemoteBdAddr, &deviceName); + if (nameExists) { + sPairingNameTable.Remove(aRemoteBdAddr); + } + + // Update attribute BluetoothDevice.name if the device is paired. + if (bonded && STATUS_SUCCESS) { + MOZ_ASSERT(nameExists); + BT_APPEND_NAMED_VALUE(propertiesArray, "Name", deviceName); + } + DistributeSignal(BluetoothSignal(NS_LITERAL_STRING("PropertyChanged"), nsString(aRemoteBdAddr), BluetoothValue(propertiesArray))); - propertiesArray.Clear(); - // Append signal properties and notify adapter. - BT_APPEND_NAMED_VALUE(propertiesArray, "Address", nsString(aRemoteBdAddr)); - BT_APPEND_NAMED_VALUE(propertiesArray, "Paired", bonded); + // Insert address to signal properties and notify adapter. + BT_INSERT_NAMED_VALUE(propertiesArray, 0, "Address", nsString(aRemoteBdAddr)); nsString signalName = bonded ? NS_LITERAL_STRING(DEVICE_PAIRED_ID) : NS_LITERAL_STRING(DEVICE_UNPAIRED_ID); From 7441220df228314c6ae771e0d67879895613de20 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 01:45:20 -0800 Subject: [PATCH 07/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/51e62647f759 Author: autolander Desc: Bug 1138343 - merge pull request #28557 from mnjul:bug_1138343_arraybuffer_userdict to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/dec5359c5804 Author: John Lu [:mnjul] Desc: Bug 1138343 - [UserDictionary, KBSettingsApp] Instantiate and store an ArrayBuffer instead of Uint8Array during dictionary blob generation Unit test also explicitly checks for Converter.toBlob()'s return object's type. --- 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 ef257d319ccd..7149f5a63aac 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "af660476962f0b1aa67af16cf8cc3c0d7533a9d5", + "git_revision": "bf2b7d41985f2588cb2707adeda7d695dced49bc", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "9b96bf2d208c9047a52cd8c395d72b61af9c7c0f", + "revision": "51e62647f759c2326da5277cab66b6c3f21c22c0", "repo_path": "integration/gaia-central" } From b36defd1faec19d3b485d469827d961d08eaf5b5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 01:47:52 -0800 Subject: [PATCH 08/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index cab99dd65de3..350d18659ccd 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 45c1d03e583f..738538dc4e31 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 906658a26480..5239f615094d 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 60785502beb0..14b8b4dd941e 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 c5b4b4327c17..2368fc44cb96 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 45c1d03e583f..738538dc4e31 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 7393f09543fa..dadcfab27302 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index a425891dc3f5..45e6a935c540 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e3bc9b9b8c58..b4cac3c96c4b 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 f05ea1e0ab44..929d732d77d8 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 2a8116336238ae5bac2be62498efbba7df13a2e2 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 3 Mar 2015 11:06:46 +0100 Subject: [PATCH 09/48] Bug 1137155: Marked destructor of |ICC| as private, r=htsai --- dom/icc/Icc.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dom/icc/Icc.h b/dom/icc/Icc.h index 9207004ecf5c..957d43966318 100644 --- a/dom/icc/Icc.h +++ b/dom/icc/Icc.h @@ -111,6 +111,8 @@ public: IMPL_EVENT_HANDLER(stksessionend) private: + ~Icc() {} + bool mLive; uint32_t mClientId; nsString mIccId; From 64d8a0c5006ceebcce67339a34e187dc36013752 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 02:16:47 -0800 Subject: [PATCH 10/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/dde8d7785ec3 Author: autolander Desc: Bug 1133321 - merge pull request #28231 from Archaeopteryx:settings-language to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/545bdcc91e38 Author: Sebastian Hengst Desc: Bug 1133321 - langpack-install-success should use actual label of 'Language' section (singular) --- 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 7149f5a63aac..d49af419cb99 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "bf2b7d41985f2588cb2707adeda7d695dced49bc", + "git_revision": "4f8d6222182608fff4f29a2b8705d2c62306fe69", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "51e62647f759c2326da5277cab66b6c3f21c22c0", + "revision": "dde8d7785ec33ed9412dd21e179da7e43dc143f2", "repo_path": "integration/gaia-central" } From ac7243d00bcc7c77e756ca8cb65693955deb1b25 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 02:19:22 -0800 Subject: [PATCH 11/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 350d18659ccd..747215a9d9bc 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 738538dc4e31..329a65e40c43 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 5239f615094d..158c15090da2 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 14b8b4dd941e..e75c0e5682db 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 2368fc44cb96..0e769bd3c447 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 738538dc4e31..329a65e40c43 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 dadcfab27302..8d0528bac549 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 45e6a935c540..bae9a2cb25ae 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b4cac3c96c4b..d0d20add5691 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 929d732d77d8..43df1b761924 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 75789097e437faff979914200c834fa0f02411d0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 02:35:23 -0800 Subject: [PATCH 12/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/bf3c9d171ea4 Author: John Hu Desc: Merge pull request #28541 from sean2449/Bug_1136624 Bug 1136624 - [Stingray] expose isVisible and focus API for action menu, r=johnhu ======== https://hg.mozilla.org/integration/gaia-central/rev/371e88d22cc6 Author: Sung Chiu Desc: Bug 1136624 - [Stingray] expose isVisible and focus API for action menu --- 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 d49af419cb99..631d01cd2c3f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "4f8d6222182608fff4f29a2b8705d2c62306fe69", + "git_revision": "6036295b7192e21c1370495617e5ab727575fea3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "dde8d7785ec33ed9412dd21e179da7e43dc143f2", + "revision": "bf3c9d171ea4c103a9a61b319a515973b5d4e5a2", "repo_path": "integration/gaia-central" } From 1b0dddd8e011ddbf820f1f3e5103444c6d76544d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 02:37:52 -0800 Subject: [PATCH 13/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 747215a9d9bc..377a6d27c633 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 329a65e40c43..f355e0a3605d 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 158c15090da2..27bdacf0390e 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 e75c0e5682db..0923d322a5b0 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 0e769bd3c447..9e0bd2296032 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 329a65e40c43..f355e0a3605d 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 8d0528bac549..778899e71cf0 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index bae9a2cb25ae..0378187b5d0e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d0d20add5691..c3ff2e659ecd 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 43df1b761924..b8f065a9da26 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 45c660250afb79ea8347f38837687cdc06191dbd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 02:51:44 -0800 Subject: [PATCH 14/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/10326d542ab7 Author: Alive.Kuo Desc: Merge pull request #28208 from alivedise/bugzilla/1098168-backout/base-icon Bug 1098168 - BaseIcon ======== https://hg.mozilla.org/integration/gaia-central/rev/eb76551e6f58 Author: Alive Kuo Desc: Bug 1098168 - BaseIcon --- 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 631d01cd2c3f..a4c63c9ab169 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "6036295b7192e21c1370495617e5ab727575fea3", + "git_revision": "d9399ecd386aaf37214c4bffcaceca335c143413", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "bf3c9d171ea4c103a9a61b319a515973b5d4e5a2", + "revision": "10326d542ab79d730caf790a0c13ff66603c91fa", "repo_path": "integration/gaia-central" } From a2da898e29764061a34d965262a2a8521a70d939 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 02:54:13 -0800 Subject: [PATCH 15/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 377a6d27c633..a068f8dd8657 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 f355e0a3605d..2ea1183e5780 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 27bdacf0390e..76df87eb8cfd 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 0923d322a5b0..10b4038d23db 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 9e0bd2296032..fe2bf1d305e0 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 f355e0a3605d..2ea1183e5780 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 778899e71cf0..0fb80a0338b7 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 0378187b5d0e..3ecf82a92646 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index c3ff2e659ecd..a7a0847331de 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 b8f065a9da26..48cffd2ed2c3 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From ccef893b05e330f81ec94f2a5e5a4a512f2dc99c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 03:06:45 -0800 Subject: [PATCH 16/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7745e64da158 Author: autolander Desc: Bug 1124150 - merge pull request #28210 from mnjul:bug_1124150_xml2dict_predictions_annotation to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/eea65c491134 Author: John Lu [:mnjul] Desc: Bug 1124150 - Keyboard: remove dead code & data structure from xml2dict.py, fix documentation for prediction engine - The "comments at the beginning of a file" documentation of xml2dict.py and predictions.js have been moved to Mozilla Wiki. This allows us to elaborate a lot more on the whole prediction/auto correction mechanism, with tabulated information, examples and ASCII-art trees. -- https://wiki.mozilla.org/Gaia/System/Keyboard/IME/Latin/Prediction_%26_Auto_Correction -- https://wiki.mozilla.org/Gaia/System/Keyboard/IME/Latin/Dictionary_Blob - In various other places in the two files, confusing comments are clarified, and terminology is unified. - Dead code from xml2dict.py has been removed. --- 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 a4c63c9ab169..c46cad8797cb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "d9399ecd386aaf37214c4bffcaceca335c143413", + "git_revision": "bdb089fcfd337fc3fe064cdcb6eeaf5689c807e9", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "10326d542ab79d730caf790a0c13ff66603c91fa", + "revision": "7745e64da1583f13d103ccc4f1aec9cb9ad1b4b1", "repo_path": "integration/gaia-central" } From 5517aebd173a78f16f6284eeab778058a2fb680e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 03:09:12 -0800 Subject: [PATCH 17/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index a068f8dd8657..48f20db93d2f 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 2ea1183e5780..100638aafdd1 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 76df87eb8cfd..0ad7c519c5ba 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 10b4038d23db..ac7d04b6077a 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 fe2bf1d305e0..54c469b8d6e3 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 2ea1183e5780..100638aafdd1 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 0fb80a0338b7..7c6d0e8e014a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 3ecf82a92646..1291149a5eed 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index a7a0847331de..7a0188b3d086 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 48cffd2ed2c3..e2bc9a66ef68 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From ce50eac5c5dbc5fa7961c61aabd57bd2e9273723 Mon Sep 17 00:00:00 2001 From: Chuck Lee Date: Sat, 28 Feb 2015 21:54:16 +0800 Subject: [PATCH 18/48] Bug 1012549 - 0001. Support import PKCS12 certificate. r=dkeeler r=vchang --- config/external/nss/nss.def | 1 + dom/wifi/WifiCertService.cpp | 170 +++++++++++++++++++--- dom/wifi/WifiWorker.js | 2 +- security/manager/ssl/src/ScopedNSSTypes.h | 4 + 4 files changed, 159 insertions(+), 18 deletions(-) diff --git a/config/external/nss/nss.def b/config/external/nss/nss.def index 302bb0a382a1..f3a77417276c 100644 --- a/config/external/nss/nss.def +++ b/config/external/nss/nss.def @@ -589,6 +589,7 @@ SEC_PKCS12DecoderFinish SEC_PKCS12DecoderImportBags SEC_PKCS12DecoderIterateInit SEC_PKCS12DecoderIterateNext +SEC_PKCS12DecoderRenameCertNicknames SEC_PKCS12DecoderStart SEC_PKCS12DecoderUpdate SEC_PKCS12DecoderValidateBags diff --git a/dom/wifi/WifiCertService.cpp b/dom/wifi/WifiCertService.cpp index 7ce7d0bcbd22..d65c781ba0dc 100644 --- a/dom/wifi/WifiCertService.cpp +++ b/dom/wifi/WifiCertService.cpp @@ -10,6 +10,7 @@ #include "WifiCertService.h" #include "mozilla/ClearOnShutdown.h" +#include "mozilla/Endian.h" #include "mozilla/ModuleUtils.h" #include "mozilla/RefPtr.h" #include "mozilla/dom/ToJSValue.h" @@ -71,9 +72,14 @@ private: return NS_ERROR_OUT_OF_MEMORY; } - // Only support DER format now. - return ImportDERBlob(buf, size, mResult.mNickname, - &mResult.mUsageFlag); + // Try import as DER format first. + rv = ImportDERBlob(buf, size); + if (NS_SUCCEEDED(rv)) { + return rv; + } + + // Try import as PKCS#12 format. + return ImportPKCS12Blob(buf, size, mPassword); } virtual void CallCallback(nsresult rv) @@ -84,20 +90,148 @@ private: gWifiCertService->DispatchResult(mResult); } - nsresult ImportDERBlob(char* buf, uint32_t size, - const nsAString& aNickname, - /*out*/ uint16_t* aUsageFlag) + nsresult ImportDERBlob(char* buf, uint32_t size) { - NS_ENSURE_ARG_POINTER(aUsageFlag); - // Create certificate object. ScopedCERTCertificate cert(CERT_DecodeCertFromPackage(buf, size)); if (!cert) { return MapSECStatus(SECFailure); } - // Import certificate with nickname. - return ImportCert(cert, aNickname, aUsageFlag); + // Import certificate. + return ImportCert(cert); + } + + static SECItem* + HandleNicknameCollision(SECItem* aOldNickname, PRBool* aCancel, void* aWincx) + { + const char* dummyName = "Imported User Cert"; + const size_t dummyNameLen = strlen(dummyName); + SECItem* newNick = ::SECITEM_AllocItem(nullptr, nullptr, dummyNameLen + 1); + if (!newNick) { + return nullptr; + } + + newNick->type = siAsciiString; + // Dummy name, will be renamed later. + memcpy(newNick->data, dummyName, dummyNameLen + 1); + newNick->len = dummyNameLen; + + return newNick; + } + + static SECStatus + HandleNicknameUpdate(const CERTCertificate *aCert, + const SECItem *default_nickname, + SECItem **new_nickname, + void *arg) + { + WifiCertServiceResultOptions *result = (WifiCertServiceResultOptions *)arg; + + nsCString userNickname; + CopyUTF16toUTF8(result->mNickname, userNickname); + + nsCString fullNickname; + if (aCert->isRoot && (aCert->nsCertType & NS_CERT_TYPE_SSL_CA)) { + // Accept self-signed SSL CA as server certificate. + fullNickname.AssignLiteral("WIFI_SERVERCERT_"); + fullNickname += userNickname; + result->mUsageFlag |= nsIWifiCertService::WIFI_CERT_USAGE_FLAG_SERVER; + } else if (aCert->nsCertType & NS_CERT_TYPE_SSL_CLIENT) { + // User Certificate + fullNickname.AssignLiteral("WIFI_USERCERT_"); + fullNickname += userNickname; + result->mUsageFlag |= nsIWifiCertService::WIFI_CERT_USAGE_FLAG_USER; + } + char* nickname; + uint32_t length = fullNickname.GetMutableData(&nickname); + + SECItem* newNick = ::SECITEM_AllocItem(nullptr, nullptr, length + 1); + if (!newNick) { + return SECFailure; + } + + newNick->type = siAsciiString; + memcpy(newNick->data, nickname, length + 1); + newNick->len = length; + + *new_nickname = newNick; + return SECSuccess; + } + + nsresult ImportPKCS12Blob(char* buf, uint32_t size, const nsAString& aPassword) + { + nsString password(aPassword); + + // password is null-terminated wide-char string. + // passwordItem is required to be big-endian form of password, stored in char + // array, including the null-termination. + uint32_t length = password.Length() + 1; + ScopedSECItem passwordItem( + ::SECITEM_AllocItem(nullptr, nullptr, length * sizeof(nsString::char_type))); + + if (!passwordItem) { + return NS_ERROR_FAILURE; + } + + mozilla::NativeEndian::copyAndSwapToBigEndian(passwordItem->data, + password.BeginReading(), + length); + // Create a decoder. + ScopedSEC_PKCS12DecoderContext p12dcx(SEC_PKCS12DecoderStart( + passwordItem, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, + nullptr)); + + if (!p12dcx) { + return NS_ERROR_FAILURE; + } + + // Assign data to decorder. + SECStatus srv = SEC_PKCS12DecoderUpdate(p12dcx, + reinterpret_cast(buf), + size); + if (srv != SECSuccess) { + return MapSECStatus(srv); + } + + // Verify certificates. + srv = SEC_PKCS12DecoderVerify(p12dcx); + if (srv != SECSuccess) { + return MapSECStatus(srv); + } + + // Set certificate nickname and usage flag. + srv = SEC_PKCS12DecoderRenameCertNicknames(p12dcx, HandleNicknameUpdate, + &mResult); + + // Validate certificates. + srv = SEC_PKCS12DecoderValidateBags(p12dcx, HandleNicknameCollision); + if (srv != SECSuccess) { + return MapSECStatus(srv); + } + + // Initialize slot. + ScopedPK11SlotInfo slot(PK11_GetInternalKeySlot()); + if (!slot) { + return NS_ERROR_FAILURE; + } + if (PK11_NeedLogin(slot) && PK11_NeedUserInit(slot)) { + srv = PK11_InitPin(slot, "", ""); + if (srv != SECSuccess) { + return MapSECStatus(srv); + } + } + + // Import cert and key. + srv = SEC_PKCS12DecoderImportBags(p12dcx); + if (srv != SECSuccess) { + return MapSECStatus(srv); + } + + // User certificate must be imported from PKCS#12. + return (mResult.mUsageFlag & nsIWifiCertService::WIFI_CERT_USAGE_FLAG_USER) + ? NS_OK : NS_ERROR_FAILURE; } nsresult ReadBlob(/*out*/ nsCString& aBuf) @@ -128,20 +262,22 @@ private: return NS_OK; } - nsresult ImportCert(CERTCertificate* aCert, const nsAString& aNickname, - /*out*/ uint16_t* aUsageFlag) + nsresult ImportCert(CERTCertificate* aCert) { - NS_ENSURE_ARG_POINTER(aUsageFlag); - nsCString userNickname, fullNickname; - CopyUTF16toUTF8(aNickname, userNickname); + CopyUTF16toUTF8(mResult.mNickname, userNickname); // Determine certificate nickname by adding prefix according to its type. if (aCert->isRoot && (aCert->nsCertType & NS_CERT_TYPE_SSL_CA)) { // Accept self-signed SSL CA as server certificate. fullNickname.AssignLiteral("WIFI_SERVERCERT_"); fullNickname += userNickname; - *aUsageFlag |= nsIWifiCertService::WIFI_CERT_USAGE_FLAG_SERVER; + mResult.mUsageFlag |= nsIWifiCertService::WIFI_CERT_USAGE_FLAG_SERVER; + } else if (aCert->nsCertType & NS_CERT_TYPE_SSL_CLIENT) { + // User Certificate + fullNickname.AssignLiteral("WIFI_USERCERT_"); + fullNickname += userNickname; + mResult.mUsageFlag |= nsIWifiCertService::WIFI_CERT_USAGE_FLAG_USER; } else { return NS_ERROR_ABORT; } @@ -154,7 +290,7 @@ private: } // Import certificate, duplicated nickname will cause error. - SECStatus srv = CERT_AddTempCertToPerm(aCert, nickname, NULL); + SECStatus srv = CERT_AddTempCertToPerm(aCert, nickname, nullptr); if (srv != SECSuccess) { return MapSECStatus(srv); } diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js index 7308b60f9263..0eb53f333c0d 100755 --- a/dom/wifi/WifiWorker.js +++ b/dom/wifi/WifiWorker.js @@ -3469,7 +3469,7 @@ WifiWorker.prototype = { WifiManager.importCert(msg.data, function(data) { if (data.status === 0) { - let usageString = ["ServerCert"]; + let usageString = ["ServerCert", "UserCert"]; let usageArray = []; for (let i = 0; i < usageString.length; i++) { if (data.usageFlag & (0x01 << i)) { diff --git a/security/manager/ssl/src/ScopedNSSTypes.h b/security/manager/ssl/src/ScopedNSSTypes.h index ec115367c3ee..c4594863f1f1 100644 --- a/security/manager/ssl/src/ScopedNSSTypes.h +++ b/security/manager/ssl/src/ScopedNSSTypes.h @@ -23,6 +23,7 @@ #include "keyhi.h" #include "cryptohi.h" #include "pk11pub.h" +#include "pkcs12.h" #include "sechash.h" #include "secpkcs7.h" #include "secport.h" @@ -240,6 +241,9 @@ MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedSEC_PKCS7ContentInfo, SEC_PKCS7ContentInfo, SEC_PKCS7DestroyContentInfo) +MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedSEC_PKCS12DecoderContext, + SEC_PKCS12DecoderContext, + SEC_PKCS12DecoderFinish) namespace internal { inline void From ed74ef56543fcec23b8d60d038e6e2883ab2d309 Mon Sep 17 00:00:00 2001 From: Chuck Lee Date: Fri, 31 Oct 2014 14:42:18 +0800 Subject: [PATCH 19/48] Bug 1012549 - 0002. Support list PKCS12 certificate. r=vchang --- dom/wifi/WifiWorker.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js index 0eb53f333c0d..89dde189dca4 100755 --- a/dom/wifi/WifiWorker.js +++ b/dom/wifi/WifiWorker.js @@ -3513,9 +3513,11 @@ WifiWorker.prototype = { } let importedCerts = { ServerCert: [], + UserCert: [], }; let UsageMapping = { SERVERCERT: "ServerCert", + USERCERT: "UserCert", }; while (certListEnum.hasMoreElements()) { From e50b79990b8d7334bd08c1c9aed819293d9fddd0 Mon Sep 17 00:00:00 2001 From: Chuck Lee Date: Fri, 31 Oct 2014 14:42:21 +0800 Subject: [PATCH 20/48] Bug 1012549 - 0003. Support delete PKCS12 certificate. r=vhcang r=dkeeler --- dom/wifi/WifiCertService.cpp | 44 ++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dom/wifi/WifiCertService.cpp b/dom/wifi/WifiCertService.cpp index d65c781ba0dc..cb90ef419975 100644 --- a/dom/wifi/WifiCertService.cpp +++ b/dom/wifi/WifiCertService.cpp @@ -329,15 +329,45 @@ private: // Delete server certificate. nsCString serverCertName("WIFI_SERVERCERT_", 16); serverCertName += userNickname; - - ScopedCERTCertificate cert( - CERT_FindCertByNickname(CERT_GetDefaultCertDB(), serverCertName.get()) - ); - if (!cert) { - return MapSECStatus(SECFailure); + nsresult rv = deleteCert(serverCertName); + if (NS_FAILED(rv)) { + return rv; + } + + // Delete user certificate and private key. + nsCString userCertName("WIFI_USERCERT_", 14); + userCertName += userNickname; + rv = deleteCert(userCertName); + if (NS_FAILED(rv)) { + return rv; + } + + return NS_OK; + } + + nsresult deleteCert(const nsCString &aCertNickname) + { + ScopedCERTCertificate cert( + CERT_FindCertByNickname(CERT_GetDefaultCertDB(), aCertNickname.get()) + ); + // Because we delete certificates in blind, so it's acceptable to delete + // a non-exist certificate. + if (!cert) { + return NS_OK; + } + + ScopedPK11SlotInfo slot( + PK11_KeyForCertExists(cert, nullptr, nullptr) + ); + + SECStatus srv; + if (slot) { + // Delete private key along with certificate. + srv = PK11_DeleteTokenCertAndKey(cert, nullptr); + } else { + srv = SEC_DeletePermCertificate(cert); } - SECStatus srv = SEC_DeletePermCertificate(cert); if (srv != SECSuccess) { return MapSECStatus(srv); } From 6cb15b84a032298a209339d4b92819be2424711c Mon Sep 17 00:00:00 2001 From: Chuck Lee Date: Sat, 28 Feb 2015 21:54:24 +0800 Subject: [PATCH 21/48] Bug 1012549 - 0004. Support read private key in keystore. r=dkeeler r=qdot --- config/external/nss/nss.def | 2 + ipc/keystore/KeyStore.cpp | 431 ++++++++++++++++++++-- ipc/keystore/KeyStore.h | 16 +- security/manager/ssl/src/ScopedNSSTypes.h | 8 + 4 files changed, 433 insertions(+), 24 deletions(-) diff --git a/config/external/nss/nss.def b/config/external/nss/nss.def index f3a77417276c..732f2b07a771 100644 --- a/config/external/nss/nss.def +++ b/config/external/nss/nss.def @@ -317,6 +317,7 @@ PK11_DigestOp PK11_DoesMechanism PK11_Encrypt PK11_ExportDERPrivateKeyInfo +PK11_ExportEncryptedPrivKeyInfo PK11_ExtractKeyValue PK11_FindCertFromNickname PK11_FindCertsFromEmailAddress @@ -512,6 +513,7 @@ SECKEY_CopyPublicKey SECKEY_CopySubjectPublicKeyInfo SECKEY_CreateSubjectPublicKeyInfo SECKEY_DecodeDERSubjectPublicKeyInfo +SECKEY_DestroyEncryptedPrivateKeyInfo SECKEY_DestroyPrivateKey SECKEY_DestroyPrivateKeyList SECKEY_DestroyPublicKey diff --git a/ipc/keystore/KeyStore.cpp b/ipc/keystore/KeyStore.cpp index 468225aee2bb..b3b0f8df7627 100644 --- a/ipc/keystore/KeyStore.cpp +++ b/ipc/keystore/KeyStore.cpp @@ -20,6 +20,7 @@ #include "KeyStore.h" #include "jsfriendapi.h" #include "MainThreadUtils.h" // For NS_IsMainThread. +#include "nsICryptoHash.h" #include "plbase64.h" #include "certdb.h" @@ -108,19 +109,65 @@ status_t BnKeystoreService::onTransact(uint32_t code, const Parcel& data, Parcel reply->writeInt32(dataLength); void* buf = reply->writeInplace(dataLength); memcpy(buf, data, dataLength); - free(data); + moz_free(data); } else { reply->writeInt32(-1); } return NO_ERROR; } break; + case GET_PUBKEY: { + CHECK_INTERFACE(IKeystoreService, data, reply); + String16 name = data.readString16(); + uint8_t* data = nullptr; + size_t dataLength = 0; + int32_t ret = get_pubkey(name, &data, &dataLength); + + reply->writeNoException(); + if (dataLength > 0 && data != nullptr) { + reply->writeInt32(dataLength); + void* buf = reply->writeInplace(dataLength); + memcpy(buf, data, dataLength); + moz_free(data); + } else { + reply->writeInt32(-1); + } + reply->writeInt32(ret); + return NO_ERROR; + } break; + case SIGN: { + CHECK_INTERFACE(IKeystoreService, data, reply); + String16 name = data.readString16(); + size_t signDataSize = data.readInt32(); + const uint8_t *signData = nullptr; + if (signDataSize >= 0 && signDataSize <= data.dataAvail()) { + signData = (const uint8_t *)data.readInplace(signDataSize); + } + + uint8_t *signResult = nullptr; + size_t signResultSize; + int32_t ret = sign(name, signData, signDataSize, &signResult, + &signResultSize); + + reply->writeNoException(); + if (signResultSize > 0 && signResult != nullptr) { + reply->writeInt32(signResultSize); + void* buf = reply->writeInplace(signResultSize); + memcpy(buf, signResult, signResultSize); + moz_free(signResult); + } else { + reply->writeInt32(-1); + } + reply->writeInt32(ret); + return NO_ERROR; + } break; default: return NO_ERROR; } } // Provide service for binder. -class KeyStoreService: public BnKeystoreService +class KeyStoreService : public BnKeystoreService + , public nsNSSShutDownObject { public: int32_t test() { @@ -133,13 +180,22 @@ public: } int32_t get(const String16& name, uint8_t** item, size_t* itemLength) { + nsNSSShutDownPreventionLock locker; + if (isAlreadyShutDown()) { + return ::SYSTEM_ERROR; + } + uid_t callingUid = IPCThreadState::self()->getCallingUid(); if (!mozilla::ipc::checkPermission(callingUid)) { return ::PERMISSION_DENIED; } String8 certName(name); - return mozilla::ipc::getCertificate(certName.string(), (const uint8_t **)item, (int *)itemLength); + if (!strncmp(certName.string(), "WIFI_USERKEY_", 13)) { + return getPrivateKey(certName.string(), (const uint8_t**)item, itemLength); + } + + return getCertificate(certName.string(), (const uint8_t**)item, itemLength); } int32_t insert(const String16& name, const uint8_t* item, size_t itemLength, int uid, int32_t flags) {return ::UNDEFINED_ACTION;} @@ -152,9 +208,50 @@ public: int32_t unlock(const String16& password) {return ::UNDEFINED_ACTION;} int32_t zero() {return ::UNDEFINED_ACTION;} int32_t import(const String16& name, const uint8_t* data, size_t length, int uid, int32_t flags) {return ::UNDEFINED_ACTION;} - int32_t sign(const String16& name, const uint8_t* data, size_t length, uint8_t** out, size_t* outLength) {return ::UNDEFINED_ACTION;} + int32_t sign(const String16& name, const uint8_t* data, size_t length, uint8_t** out, size_t* outLength) + { + nsNSSShutDownPreventionLock locker; + if (isAlreadyShutDown()) { + return ::SYSTEM_ERROR; + } + + uid_t callingUid = IPCThreadState::self()->getCallingUid(); + if (!mozilla::ipc::checkPermission(callingUid)) { + return ::PERMISSION_DENIED; + } + + if (data == nullptr) { + return ::SYSTEM_ERROR; + } + + String8 keyName(name); + if (!strncmp(keyName.string(), "WIFI_USERKEY_", 13)) { + return signData(keyName.string(), data, length, out, outLength); + } + + return ::UNDEFINED_ACTION; + } + int32_t verify(const String16& name, const uint8_t* data, size_t dataLength, const uint8_t* signature, size_t signatureLength) {return ::UNDEFINED_ACTION;} - int32_t get_pubkey(const String16& name, uint8_t** pubkey, size_t* pubkeyLength) {return ::UNDEFINED_ACTION;} + int32_t get_pubkey(const String16& name, uint8_t** pubkey, size_t* pubkeyLength) { + nsNSSShutDownPreventionLock locker; + if (isAlreadyShutDown()) { + return ::SYSTEM_ERROR; + } + + uid_t callingUid = IPCThreadState::self()->getCallingUid(); + if (!mozilla::ipc::checkPermission(callingUid)) { + return ::PERMISSION_DENIED; + } + + String8 keyName(name); + if (!strncmp(keyName.string(), "WIFI_USERKEY_", 13)) { + return getPublicKey(keyName.string(), (const uint8_t**)pubkey, pubkeyLength); + } + + return ::UNDEFINED_ACTION; + } + int32_t del_key(const String16& name, int uid) {return ::UNDEFINED_ACTION;} int32_t grant(const String16& name, int32_t granteeUid) {return ::UNDEFINED_ACTION;} int32_t ungrant(const String16& name, int32_t granteeUid) {return ::UNDEFINED_ACTION;} @@ -174,6 +271,18 @@ public: virtual int32_t generate(const String16& name, int32_t uid, int32_t keyType, int32_t keySize, int32_t flags, Vector >* args) {return ::UNDEFINED_ACTION;} virtual int32_t is_hardware_backed(const String16& keyType) {return ::UNDEFINED_ACTION;} #endif + +protected: + virtual void virtualDestroyNSSReference() {} + +private: + ~KeyStoreService() { + nsNSSShutDownPreventionLock locker; + if (isAlreadyShutDown()) { + return; + } + shutdown(calledFromObject); + } }; } // namespace android @@ -210,19 +319,24 @@ static const char* KEYSTORE_ALLOWED_PREFIXES[] = { // Transform base64 certification data into DER format void -FormatCaData(const uint8_t *aCaData, int aCaDataLength, +FormatCaData(const char *aCaData, int aCaDataLength, const char *aName, const uint8_t **aFormatData, - int *aFormatDataLength) + size_t *aFormatDataLength) { - int bufSize = strlen(CA_BEGIN) + strlen(CA_END) + strlen(CA_TAILER) * 2 + - strlen(aName) * 2 + aCaDataLength + aCaDataLength/CA_LINE_SIZE + 2; - char *buf = (char *)malloc(bufSize); + size_t bufSize = strlen(CA_BEGIN) + strlen(CA_END) + strlen(CA_TAILER) * 2 + + strlen(aName) * 2 + aCaDataLength + aCaDataLength/CA_LINE_SIZE + + 2; + char *buf = (char *)moz_malloc(bufSize); + if (!buf) { + *aFormatData = nullptr; + return; + } *aFormatDataLength = bufSize; *aFormatData = (const uint8_t *)buf; char *ptr = buf; - int len; + size_t len; // Create DER header. len = snprintf(ptr, bufSize, "%s%s%s", CA_BEGIN, aName, CA_TAILER); @@ -250,7 +364,8 @@ FormatCaData(const uint8_t *aCaData, int aCaDataLength, } ResponseCode -getCertificate(const char *aCertName, const uint8_t **aCertData, int *aCertDataLength) +getCertificate(const char *aCertName, const uint8_t **aCertData, + size_t *aCertDataLength) { // certificate name prefix check. if (!aCertName) { @@ -281,10 +396,266 @@ getCertificate(const char *aCertName, const uint8_t **aCertData, int *aCertDataL return SYSTEM_ERROR; } - FormatCaData((const uint8_t *)certDER, strlen(certDER), "CERTIFICATE", - aCertData, aCertDataLength); + FormatCaData(certDER, strlen(certDER), "CERTIFICATE", aCertData, + aCertDataLength); PL_strfree(certDER); + if (!(*aCertData)) { + return SYSTEM_ERROR; + } + + return SUCCESS; +} + +ResponseCode getPrivateKey(const char *aKeyName, const uint8_t **aKeyData, + size_t *aKeyDataLength) +{ + *aKeyData = nullptr; + // Get corresponding user certificate nickname + char userCertName[128] = {0}; + snprintf(userCertName, sizeof(userCertName) - 1, "WIFI_USERCERT_%s", aKeyName + 13); + + // Get private key from user certificate. + ScopedCERTCertificate userCert( + CERT_FindCertByNickname(CERT_GetDefaultCertDB(), userCertName)); + if (!userCert) { + return KEY_NOT_FOUND; + } + + ScopedSECKEYPrivateKey privateKey( + PK11_FindKeyByAnyCert(userCert.get(), nullptr)); + if (!privateKey) { + return KEY_NOT_FOUND; + } + + // Export private key in PKCS#12 encrypted format, no password. + unsigned char pwstr[] = {0, 0}; + SECItem password = {siBuffer, pwstr, sizeof(pwstr)}; + ScopedSECKEYEncryptedPrivateKeyInfo encryptedPrivateKey( + PK11_ExportEncryptedPrivKeyInfo(privateKey->pkcs11Slot, + SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC4, &password, privateKey, 1, + privateKey->wincx)); + + if (!encryptedPrivateKey) { + return KEY_NOT_FOUND; + } + + // Decrypt into RSA private key. + // + // Generate key for PKCS#12 encryption, we use SHA1 with 1 iteration, as the + // parameters used in PK11_ExportEncryptedPrivKeyInfo() above. + // see: PKCS#12 v1.0, B.2. + // + uint8_t DSP[192] = {0}; + memset(DSP, 0x01, 64); // Diversifier part, ID = 1 for decryption. + memset(DSP + 128, 0x00, 64); // Password part, no password. + + uint8_t *S = &DSP[64]; // Salt part. + uint8_t *salt = encryptedPrivateKey->algorithm.parameters.data + 4; + int saltLength = (int)encryptedPrivateKey->algorithm.parameters.data[3]; + if (saltLength <= 0) { + return SYSTEM_ERROR; + } + for (int i = 0; i < 64; i++) { + S[i] = salt[i % saltLength]; + } + + // Generate key by SHA-1 + nsresult rv; + nsCOMPtr hash = + do_CreateInstance("@mozilla.org/security/hash;1", &rv); + if (NS_FAILED(rv)) { + return SYSTEM_ERROR; + } + + rv = hash->Init(nsICryptoHash::SHA1); + if (NS_FAILED(rv)) { + return SYSTEM_ERROR; + } + + rv = hash->Update(DSP, sizeof(DSP)); + if (NS_FAILED(rv)) { + return SYSTEM_ERROR; + } + + nsCString hashResult; + rv = hash->Finish(false, hashResult); + if (NS_FAILED(rv)) { + return SYSTEM_ERROR; + } + + // First 40-bit as key for RC4. + uint8_t key[5]; + memcpy(key, hashResult.get(), sizeof(key)); + + ScopedPK11SlotInfo slot(PK11_GetInternalSlot()); + if (!slot) { + return SYSTEM_ERROR; + } + + SECItem keyItem = {siBuffer, key, sizeof(key)}; + ScopedPK11SymKey symKey(PK11_ImportSymKey(slot, CKM_RC4, PK11_OriginUnwrap, + CKA_DECRYPT, &keyItem, nullptr)); + if (!symKey) { + return SYSTEM_ERROR; + } + + // Get expected decrypted data size then allocate memory. + uint8_t *encryptedData = (uint8_t *)encryptedPrivateKey->encryptedData.data; + unsigned int encryptedDataLen = encryptedPrivateKey->encryptedData.len; + unsigned int decryptedDataLen = encryptedDataLen; + SECStatus srv = PK11_Decrypt(symKey, CKM_RC4, &keyItem, nullptr, + &decryptedDataLen, encryptedDataLen, + encryptedData, encryptedDataLen); + if (srv != SECSuccess) { + return SYSTEM_ERROR; + } + + ScopedSECItem decryptedData(::SECITEM_AllocItem(nullptr, nullptr, + decryptedDataLen)); + if (!decryptedData) { + return SYSTEM_ERROR; + } + + // Decrypt by RC4. + srv = PK11_Decrypt(symKey, CKM_RC4, &keyItem, decryptedData->data, + &decryptedDataLen, decryptedData->len, encryptedData, + encryptedDataLen); + if (srv != SECSuccess) { + return SYSTEM_ERROR; + } + + // Export key in PEM format. + char *keyPEM = PL_Base64Encode((const char *)decryptedData->data, + decryptedDataLen, nullptr); + + if (!keyPEM) { + return SYSTEM_ERROR; + } + + FormatCaData(keyPEM, strlen(keyPEM), "PRIVATE KEY", aKeyData, aKeyDataLength); + PL_strfree(keyPEM); + + if (!(*aKeyData)) { + return SYSTEM_ERROR; + } + + return SUCCESS; +} + +ResponseCode getPublicKey(const char *aKeyName, const uint8_t **aKeyData, + size_t *aKeyDataLength) +{ + *aKeyData = nullptr; + + // Get corresponding user certificate nickname + char userCertName[128] = {0}; + snprintf(userCertName, sizeof(userCertName) - 1, "WIFI_USERCERT_%s", aKeyName + 13); + + // Get public key from user certificate. + ScopedCERTCertificate userCert( + CERT_FindCertByNickname(CERT_GetDefaultCertDB(), userCertName)); + if (!userCert) { + return KEY_NOT_FOUND; + } + + // Get public key. + ScopedSECKEYPublicKey publicKey(CERT_ExtractPublicKey(userCert)); + if (!publicKey) { + return KEY_NOT_FOUND; + } + + ScopedSECItem keyItem(PK11_DEREncodePublicKey(publicKey)); + if (!keyItem) { + return KEY_NOT_FOUND; + } + + size_t bufSize = keyItem->len; + char *buf = (char *)moz_malloc(bufSize); + if (!buf) { + return SYSTEM_ERROR; + } + + memcpy(buf, keyItem->data, bufSize); + *aKeyData = (const uint8_t *)buf; + *aKeyDataLength = bufSize; + + return SUCCESS; +} + +ResponseCode signData(const char *aKeyName, const uint8_t *data, size_t length, + uint8_t **out, size_t *outLength) +{ + *out = nullptr; + // Get corresponding user certificate nickname + char userCertName[128] = {0}; + snprintf(userCertName, sizeof(userCertName) - 1, "WIFI_USERCERT_%s", aKeyName + 13); + + // Get private key from user certificate. + ScopedCERTCertificate userCert( + CERT_FindCertByNickname(CERT_GetDefaultCertDB(), userCertName)); + if (!userCert) { + return KEY_NOT_FOUND; + } + + ScopedSECKEYPrivateKey privateKey( + PK11_FindKeyByAnyCert(userCert.get(), nullptr)); + if (!privateKey) { + return KEY_NOT_FOUND; + } + + // + // Find hash data from incoming data. + // + // Incoming data might be padded by PKCS-1 format: + // 00 01 FF FF ... FF 00 || Hash of length 36 + // If the padding part exists, we have to ignore them. + // + uint8_t *hash = (uint8_t *)data; + const size_t HASH_LENGTH = 36; + if (length < HASH_LENGTH) { + return VALUE_CORRUPTED; + } + if (hash[0] == 0x00 && hash[1] == 0x01 && hash[2] == 0xFF && hash[3] == 0xFF) { + hash += 4; + while (*hash == 0xFF) { + if (hash + HASH_LENGTH > data + length) { + return VALUE_CORRUPTED; + } + hash++; + } + if (*hash != 0x00) { + return VALUE_CORRUPTED; + } + hash++; + } + if (hash + HASH_LENGTH != data + length) { + return VALUE_CORRUPTED; + } + SECItem hashItem = {siBuffer, hash, HASH_LENGTH}; + + // Sign hash. + ScopedSECItem signItem(::SECITEM_AllocItem(nullptr, nullptr, + PK11_SignatureLen(privateKey))); + if (!signItem) { + return SYSTEM_ERROR; + } + + SECStatus srv; + srv = PK11_Sign(privateKey, signItem.get(), &hashItem); + if (srv != SECSuccess) { + return SYSTEM_ERROR; + } + + uint8_t *buf = (uint8_t *)moz_malloc(signItem->len); + if (!buf) { + return SYSTEM_ERROR; + } + + memcpy(buf, signItem->data, signItem->len); + *out = buf; + *outLength = signItem->len; + return SUCCESS; } @@ -465,8 +836,15 @@ KeyStore::KeyStore() KeyStore::~KeyStore() { + nsNSSShutDownPreventionLock locker; MOZ_COUNT_DTOR(KeyStore); + if (isAlreadyShutDown()) { + return; + } + + shutdown(calledFromObject); + MOZ_ASSERT(!mListenSocket); MOZ_ASSERT(!mStreamSocket); } @@ -671,20 +1049,31 @@ KeyStore::ReceiveSocketData(nsAutoPtr& aMessage) break; case STATE_PROCESSING: if (mHandlerInfo.command == 'g') { - // Get CA - const uint8_t *certData; - int certDataLength; - const char *certName = (const char *)mHandlerInfo.param[0].data; + result = SYSTEM_ERROR; - result = getCertificate(certName, &certData, &certDataLength); + nsNSSShutDownPreventionLock locker; + if (isAlreadyShutDown()) { + break; + } + + // Get CA + const uint8_t *data; + size_t dataLength; + const char *name = (const char *)mHandlerInfo.param[0].data; + + if (!strncmp(name, "WIFI_USERKEY_", 13)) { + result = getPrivateKey(name, &data, &dataLength); + } else { + result = getCertificate(name, &data, &dataLength); + } if (result != SUCCESS) { break; } SendResponse(SUCCESS); - SendData(certData, certDataLength); + SendData(data, (int)dataLength); - free((void *)certData); + moz_free((void *)data); } ResetHandlerInfo(); diff --git a/ipc/keystore/KeyStore.h b/ipc/keystore/KeyStore.h index e1d8916b1106..b48c665396bf 100644 --- a/ipc/keystore/KeyStore.h +++ b/ipc/keystore/KeyStore.h @@ -13,6 +13,7 @@ #include "mozilla/ipc/ListenSocket.h" #include "mozilla/ipc/StreamSocket.h" #include "mozilla/ipc/UnixSocketConnector.h" +#include "nsNSSShutDown.h" namespace mozilla { namespace ipc { @@ -36,10 +37,16 @@ enum ResponseCode { void FormatCaData(const uint8_t *aCaData, int aCaDataLength, const char *aName, const uint8_t **aFormatData, - int *aFormatDataLength); + size_t *aFormatDataLength); ResponseCode getCertificate(const char *aCertName, const uint8_t **aCertData, - int *aCertDataLength); + size_t *aCertDataLength); +ResponseCode getPrivateKey(const char *aKeyName, const uint8_t **aKeyData, + size_t *aKeyDataLength); +ResponseCode getPublicKey(const char *aKeyName, const uint8_t **aKeyData, + size_t *aKeyDataLength); +ResponseCode signData(const char *aKeyName, const uint8_t *data, size_t length, + uint8_t **out, size_t *outLength); bool checkPermission(uid_t uid); @@ -92,7 +99,7 @@ public: nsAString& aAddrStr); }; -class KeyStore MOZ_FINAL +class KeyStore MOZ_FINAL : public nsNSSShutDownObject { public: NS_INLINE_DECL_THREADSAFE_REFCOUNTING(KeyStore) @@ -101,6 +108,9 @@ public: void Shutdown(); +protected: + virtual void virtualDestroyNSSReference() {} + private: enum SocketType { LISTEN_SOCKET, diff --git a/security/manager/ssl/src/ScopedNSSTypes.h b/security/manager/ssl/src/ScopedNSSTypes.h index c4594863f1f1..52af33bbb966 100644 --- a/security/manager/ssl/src/ScopedNSSTypes.h +++ b/security/manager/ssl/src/ScopedNSSTypes.h @@ -311,6 +311,11 @@ inline void SECOID_DestroyAlgorithmID_true(SECAlgorithmID * a) return SECOID_DestroyAlgorithmID(a, true); } +inline void SECKEYEncryptedPrivateKeyInfo_true(SECKEYEncryptedPrivateKeyInfo * epki) +{ + return SECKEY_DestroyEncryptedPrivateKeyInfo(epki, PR_TRUE); +} + } // namespace internal MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedSECItem, @@ -320,6 +325,9 @@ MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedSECItem, MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedSECKEYPrivateKey, SECKEYPrivateKey, SECKEY_DestroyPrivateKey) +MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedSECKEYEncryptedPrivateKeyInfo, + SECKEYEncryptedPrivateKeyInfo, + internal::SECKEYEncryptedPrivateKeyInfo_true) MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedSECKEYPublicKey, SECKEYPublicKey, SECKEY_DestroyPublicKey) From e75a6e55d683cc60a4bdf535dfb36493def81dae Mon Sep 17 00:00:00 2001 From: Morris Tseng Date: Thu, 26 Feb 2015 01:01:00 +0100 Subject: [PATCH 22/48] Bug 1125045 - yAxisVisible should compare with offset.height instead of pos.width. r=xyuan --- dom/inputmethod/forms.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/inputmethod/forms.js b/dom/inputmethod/forms.js index 40163baf09cb..7bb336bb3331 100644 --- a/dom/inputmethod/forms.js +++ b/dom/inputmethod/forms.js @@ -124,7 +124,7 @@ let FormVisibility = { let visible = this.yAxisVisible( adjustedTop, pos.height, - pos.width + offset.height ); if (!visible) From 1f4cf351acac0ea848c0c7c6f4b2e3ca158fb730 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 07:50:10 -0800 Subject: [PATCH 23/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cf6f2b6817a1 Author: Guillaume C. Marty Desc: Merge pull request #28278 from gmarty/Bug-1132418-Incorrect-coloured-status-bar-and-icons Bug 1132418 - [FTE] Incorrect coloured status bar and icons ======== https://hg.mozilla.org/integration/gaia-central/rev/8ae712ae4d8c Author: Guillaume Marty Desc: Bug 1132418 - [FTE] Incorrect coloured status bar and icons --- 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 c46cad8797cb..4a319ed0b2a6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "bdb089fcfd337fc3fe064cdcb6eeaf5689c807e9", + "git_revision": "c6492a4f9ef646b0f129db53b06e46f8470d1acf", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "7745e64da1583f13d103ccc4f1aec9cb9ad1b4b1", + "revision": "cf6f2b6817a16999d7f39eb0deac04b45ba8ac41", "repo_path": "integration/gaia-central" } From bd219e1daad2dcf46ba82f91ae169c6ff8442672 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 07:52:37 -0800 Subject: [PATCH 24/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 48f20db93d2f..f7cf5db1fd9e 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 100638aafdd1..970ab5100e65 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 0ad7c519c5ba..0e36078d1bae 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 ac7d04b6077a..b9a447b9d023 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 54c469b8d6e3..7a5aa0c6c15d 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 100638aafdd1..970ab5100e65 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 7c6d0e8e014a..8259c34f8684 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 1291149a5eed..efc5cece545d 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 7a0188b3d086..aa6c1634357f 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 e2bc9a66ef68..3487542210ac 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 1d4fca1c1737b9c7db932e6d3f4b75dbd91d7c1a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 08:05:22 -0800 Subject: [PATCH 25/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/076f5a20befe Author: Etienne Segonzac Desc: Merge pull request #28329 from etiennesegonzac/bug-1132377 Bug 1132377 - Removing the Privacy Panel app from the production list. r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/4b24c024a79c Author: Etienne Segonzac Desc: Bug 1132377 - Removing the Privacy Panel app from the production list. r=timdream --- 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 4a319ed0b2a6..bc5728c44ae8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "c6492a4f9ef646b0f129db53b06e46f8470d1acf", + "git_revision": "c046b1ca9a95ca132e558ac1b24fdc170907c5f4", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "cf6f2b6817a16999d7f39eb0deac04b45ba8ac41", + "revision": "076f5a20befe8e7fb541e99a5df2e12f31c45d96", "repo_path": "integration/gaia-central" } From 1d2126f381c5b79e5abe19277521eae9bbde9981 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 08:07:51 -0800 Subject: [PATCH 26/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f7cf5db1fd9e..0c7f8cee2de0 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 970ab5100e65..3076e3fb1ab5 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 0e36078d1bae..a1e4916f16bd 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 b9a447b9d023..136cd12d8022 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 7a5aa0c6c15d..23de1c4689a2 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 970ab5100e65..3076e3fb1ab5 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 8259c34f8684..502446ec04cb 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index efc5cece545d..91976a8d643c 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index aa6c1634357f..7a80bb4fe295 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 3487542210ac..7b188c59d466 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From c0730382e842fefffc2ecfe3db2950b2255a26ba Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 08:21:46 -0800 Subject: [PATCH 27/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e1cc4a8e35ad Author: autolander Desc: Bug 1136791 - merge pull request #28568 from mwargers:packaged_app to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/de95a737047c Author: Martijn Wargers Desc: Bug 1136791 - test_marketplace_packaged_app times out after opening Marketplace, unable to search --- 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 bc5728c44ae8..dd750cba0014 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "c046b1ca9a95ca132e558ac1b24fdc170907c5f4", + "git_revision": "d0cc0eaa37e5f863680933b2493042b74bb72030", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "076f5a20befe8e7fb541e99a5df2e12f31c45d96", + "revision": "e1cc4a8e35ad9886477f5dd3cc15421a38d1225a", "repo_path": "integration/gaia-central" } From f1f795e4523a2ea3a7390f4682a34de17ce28684 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 08:24:15 -0800 Subject: [PATCH 28/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 0c7f8cee2de0..a785abbc52a5 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 3076e3fb1ab5..df7a4b72bad1 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 a1e4916f16bd..5689d5a5427c 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 136cd12d8022..e6773ba0d64d 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 23de1c4689a2..35a7ff4b5c45 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 3076e3fb1ab5..df7a4b72bad1 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 502446ec04cb..214a8ed99f99 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 91976a8d643c..f19c24480573 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 7a80bb4fe295..503d615585d7 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 7b188c59d466..1bc3b33ccec4 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From b80d696472bb6f75e1b2a59574d4d979d9ef6f6b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 08:40:15 -0800 Subject: [PATCH 29/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/800a1c31aa84 Author: autolander Desc: Bug 1120974 - merge pull request #28363 from etiennesegonzac:bug-1120974 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/d36c17313eb5 Author: Etienne Segonzac Desc: Bug 1120974 - Hide the keyboard and switch to protrait before showing the cardview r=sfoster, alive --- 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 dd750cba0014..b82a204d436e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "d0cc0eaa37e5f863680933b2493042b74bb72030", + "git_revision": "2f9358d6b549607578c42969b017aa0845d3aa34", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "e1cc4a8e35ad9886477f5dd3cc15421a38d1225a", + "revision": "800a1c31aa84f59e90ae5437bf5fec8b4e3c7b86", "repo_path": "integration/gaia-central" } From 008b3b3028ae5073f815bbb3af2442bbf089201d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 08:43:08 -0800 Subject: [PATCH 30/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index a785abbc52a5..a4dbe2ab88b2 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 df7a4b72bad1..302d3c0f6ddb 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 5689d5a5427c..dd6922cc55e7 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 e6773ba0d64d..aad5c66eb7c9 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 35a7ff4b5c45..e1a352be8673 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 df7a4b72bad1..302d3c0f6ddb 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 214a8ed99f99..094f10a0857e 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index f19c24480573..bef1c9ea61c7 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 503d615585d7..04f172d9584f 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 1bc3b33ccec4..9fb1c1141939 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 86c72ba7b5675877a94546dfab9b6e7e11eb9d66 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 09:21:50 -0800 Subject: [PATCH 31/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4c118bbbc83e Author: Etienne Segonzac Desc: Merge pull request #28178 from alivedise/single-sim-icon Bug 1132494 - Mobile connection icon should check isMultiSIM r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/82374c747bbf Author: Alive Kuo Desc: Bug 1132494 - Mobile connection icon should check isMultiSIM --- 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 b82a204d436e..68376f0cf010 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "2f9358d6b549607578c42969b017aa0845d3aa34", + "git_revision": "5982810a30988ce45ccf665b37cbeea7247855d5", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "800a1c31aa84f59e90ae5437bf5fec8b4e3c7b86", + "revision": "4c118bbbc83e19dd1e91b66a1472346b485e7d8b", "repo_path": "integration/gaia-central" } From bb41143e390be74d888b1b8b61f8f6a9028a8852 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 09:24:17 -0800 Subject: [PATCH 32/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index a4dbe2ab88b2..331407637303 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 302d3c0f6ddb..510678c33600 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 dd6922cc55e7..7400ef00e337 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 aad5c66eb7c9..9e8a3068d7e2 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 e1a352be8673..b9525c518d86 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 302d3c0f6ddb..510678c33600 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 094f10a0857e..2f928adf5401 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index bef1c9ea61c7..a4d9ff3ea46f 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 04f172d9584f..a22cc3247d04 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 9fb1c1141939..bd61b78c44d4 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From a0687ea225cfb29877fb61ff819a8013b765ee98 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 11:09:31 -0800 Subject: [PATCH 33/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 331407637303..e71fa242dee1 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -128,7 +128,7 @@ - + From 56fd0fefc7ba3464198c590974e97c218da05202 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 11:20:18 -0800 Subject: [PATCH 34/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/069b4f8b9a88 Author: Marshall Culpepper Desc: Merge pull request #28500 from marshall/bug1137064_debugAppURLs Bug 1137064 - Debug app manifest URLs again in AppUsageMetrics ======== https://hg.mozilla.org/integration/gaia-central/rev/960888367d39 Author: Marshall Culpepper Desc: Bug 1137064 - Debug app manifest URLs again in AppUsageMetrics. r=me --- 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 68376f0cf010..e359880041fa 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "5982810a30988ce45ccf665b37cbeea7247855d5", + "git_revision": "4a0f8bc058c27b7900f1727b13106147179f29ca", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "4c118bbbc83e19dd1e91b66a1472346b485e7d8b", + "revision": "069b4f8b9a8872815104cd1333de355ca924a3e0", "repo_path": "integration/gaia-central" } From 0b1101625640db955b3c3210fb7fa1e0c97b7547 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 11:23:03 -0800 Subject: [PATCH 35/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index e71fa242dee1..7ad72269778c 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 510678c33600..f1a6b4da2bbb 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 7400ef00e337..9382469f6562 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 9e8a3068d7e2..164bea6484f8 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 b9525c518d86..c1b58fd030a5 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 510678c33600..f1a6b4da2bbb 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 2f928adf5401..48a0964cb209 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index a4d9ff3ea46f..0af883970dd5 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index a22cc3247d04..e6a333aeea63 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 bd61b78c44d4..a57d2c934f86 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 5e32cce36ad2b44f938b1f97ba8c4c4bdab52378 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 11:55:36 -0800 Subject: [PATCH 36/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ba6b00b1d608 Author: Dave Hunt Desc: Bug 1138402 - Cleanup import for marionette-client 0.9. r=gmealer ======== https://hg.mozilla.org/integration/gaia-central/rev/6534c5c899a0 Author: Dave Hunt Desc: Bug 1138402 - Bump marionette_client dependency to 0.9. r=gmealer --- 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 e359880041fa..38c0c1154bda 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "4a0f8bc058c27b7900f1727b13106147179f29ca", + "git_revision": "eb1193cd6d71e260744754c6fda6f67f2f90d90f", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "069b4f8b9a8872815104cd1333de355ca924a3e0", + "revision": "ba6b00b1d6088d7921ff0f453decc6379d7e842a", "repo_path": "integration/gaia-central" } From 65cb958357756ed5dc3c82e512a04d4e65d24fdd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 11:58:07 -0800 Subject: [PATCH 37/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 7ad72269778c..6bec5382c9b7 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 f1a6b4da2bbb..55e7b1a48494 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 9382469f6562..6081874c6d15 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 164bea6484f8..f94f7e142e92 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 c1b58fd030a5..c4f6b1e1cd8b 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 f1a6b4da2bbb..55e7b1a48494 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 48a0964cb209..ae9aea3f0862 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 0af883970dd5..09de41b99e9a 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e6a333aeea63..ac064c7ba1b7 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 a57d2c934f86..9847569527d8 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From c6d5887d43c2c4504ca0ea97142b69b4be6fba2f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 12:10:25 -0800 Subject: [PATCH 38/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3ff25fe63701 Author: Eli Perelman Desc: Merge pull request #28603 from eliperelman/bug-1132179 Bug 1132179 - Bumping gaia-raptor to 0.7.0 r=rwood ======== https://hg.mozilla.org/integration/gaia-central/rev/966432432e85 Author: Eli Perelman Desc: Bug 1132179 - Bumping gaia-raptor to 0.7.0 --- 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 38c0c1154bda..611d5c875560 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "eb1193cd6d71e260744754c6fda6f67f2f90d90f", + "git_revision": "66233b9384a7addc2c06fbde7531bb96e68fcdd8", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "ba6b00b1d6088d7921ff0f453decc6379d7e842a", + "revision": "3ff25fe6370107c7af105e3539728351cf45dba4", "repo_path": "integration/gaia-central" } From c913ebb6f800f1b4fd4931e962a92ef224401bf4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 12:13:20 -0800 Subject: [PATCH 39/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 6bec5382c9b7..ece67b7a41db 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 55e7b1a48494..001423751a0e 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 6081874c6d15..78af4f11da7b 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 f94f7e142e92..55d5b4cbc50d 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 c4f6b1e1cd8b..abc479b1f952 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 55e7b1a48494..001423751a0e 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 ae9aea3f0862..326010794f54 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 09de41b99e9a..ab298e0955c7 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ac064c7ba1b7..645df723dafc 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 9847569527d8..d40b27deb617 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 6f296f27e606ab61a27d9b37c8ea9346414f0a1e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 12:30:13 -0800 Subject: [PATCH 40/48] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0f2537930a3d Author: Julien Wajsberg Desc: Bug 1137613 - [System] The animation that shows a notification feels sluggish r=mhenretty --- 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 611d5c875560..6138d46dfb7e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "66233b9384a7addc2c06fbde7531bb96e68fcdd8", + "git_revision": "7f1d04fb1ffa72578b75c7ebba64ed221fbc230e", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "3ff25fe6370107c7af105e3539728351cf45dba4", + "revision": "0f2537930a3d31c67ebd86503134763b2675f5ea", "repo_path": "integration/gaia-central" } From 35c46218c57b37249edac62c5308b7b39efa6d21 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 12:32:47 -0800 Subject: [PATCH 41/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ece67b7a41db..9f7dcbbdfbaa 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 001423751a0e..ea01e77acbe0 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 78af4f11da7b..2454bc132aa2 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 55d5b4cbc50d..b3298df862fa 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 abc479b1f952..ad32ed4c60a5 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 001423751a0e..ea01e77acbe0 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 326010794f54..fc258c032d24 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index ab298e0955c7..8f41dbfd4ffc 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 645df723dafc..7bbc5cf388b6 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 d40b27deb617..8368760e008a 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 213e8674bee1fc1884b8423be2f2f9160dc5aa57 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 13:15:44 -0800 Subject: [PATCH 42/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 9f7dcbbdfbaa..a84ef6c95141 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -138,7 +138,7 @@ - + From c311b037977f4718e8ea35b1fc418884d5a2f05d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 13:35:14 -0800 Subject: [PATCH 43/48] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b0aa26d6512f Author: autolander Desc: Bug 1138726 - merge pull request #28577 from KevinGrandon:bug_1138726_move_system_fixture_apps to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/138f1b659ff9 Author: Kevin Grandon Desc: Bug 1138726 - Move system apps into fixtures folder r=timdream r=alive --- 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 6138d46dfb7e..f3239911e79c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "7f1d04fb1ffa72578b75c7ebba64ed221fbc230e", + "git_revision": "c668713b05bcf2f4c34b20b5392c8ac267983f6a", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "0f2537930a3d31c67ebd86503134763b2675f5ea", + "revision": "b0aa26d6512f0a3e3a59096ade8d8a523ec99f6c", "repo_path": "integration/gaia-central" } From 5cf0d90bd6b2b694e670618c3dd87c454693db5b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 13:37:41 -0800 Subject: [PATCH 44/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index a84ef6c95141..808af65af4ec 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 ea01e77acbe0..f26b79f006c5 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 2454bc132aa2..c3668b9e4292 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 b3298df862fa..624b829d5209 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 ad32ed4c60a5..627fa9656711 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 ea01e77acbe0..f26b79f006c5 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 fc258c032d24..d19ae7618ae3 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 8f41dbfd4ffc..34b29421a3cf 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 7bbc5cf388b6..f92c8be8ccf7 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 8368760e008a..f3e16ab0a55b 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 0a52a00d55e56f52f7320e97b7fddf07b989f384 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 14:06:48 -0800 Subject: [PATCH 45/48] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cef21332c158 Author: Kevin Grandon Desc: Merge pull request #28594 from Cwiiis/bug1118006-shorter-edit-mode-longpress Bug 1118006 - Make the long-press delay shorter in edit mode. r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/5c69910904a5 Author: Chris Lord Desc: Bug 1118006 - Make the long-press delay shorter in edit mode. r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/d35835a1449a Author: autolander Desc: Bug 1138963 - merge pull request #28599 from julienw:ringtones-test-are-slow to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/08b2f326fdf4 Author: Julien Wajsberg Desc: Bug 1138963 - [Ringtones] The marionette tests are really slow r=jporter --- 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 f3239911e79c..271b568263f4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "c668713b05bcf2f4c34b20b5392c8ac267983f6a", + "git_revision": "ca977c05017e118a2a2ebefe2bd86a69cf968324", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "b0aa26d6512f0a3e3a59096ade8d8a523ec99f6c", + "revision": "cef21332c1580244660dbf85167c16d0bf968f67", "repo_path": "integration/gaia-central" } From 59822e8324343d2dc4b441d59cf3ec2decc37c47 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 14:09:17 -0800 Subject: [PATCH 46/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 808af65af4ec..625194ecc2f9 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 f26b79f006c5..e4594729a768 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 c3668b9e4292..b212ff89bc66 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 624b829d5209..bce7cfe2ab29 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 627fa9656711..f834f25c8a47 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 f26b79f006c5..e4594729a768 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 d19ae7618ae3..b1aade0d0d21 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 34b29421a3cf..383b93f79b54 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index f92c8be8ccf7..67e3103ae327 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 f3e16ab0a55b..faacc739f914 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 03cee3441650d268d57af0372373809e124176e3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 14:20:21 -0800 Subject: [PATCH 47/48] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9e03b76f6b75 Author: Kevin Grandon Desc: Revert "Bug 1137613 - [System] The animation that shows a notification feels sluggish r=mhenretty" This reverts commit 7f1d04fb1ffa72578b75c7ebba64ed221fbc230e. --- 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 271b568263f4..f87934095cff 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "ca977c05017e118a2a2ebefe2bd86a69cf968324", + "git_revision": "3fc0ac309f5fb0c1fe82c12223b955a4efce27e6", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "cef21332c1580244660dbf85167c16d0bf968f67", + "revision": "9e03b76f6b75d6fe3c3bccc9ae5eb104d3530c96", "repo_path": "integration/gaia-central" } From d23080fc1aa480df277467b0ce7544b353b99564 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 3 Mar 2015 14:22:48 -0800 Subject: [PATCH 48/48] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/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/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 625194ecc2f9..2c9250ad4ee2 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 e4594729a768..ba5711013450 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 b212ff89bc66..868faa62f303 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 bce7cfe2ab29..178ae15b7191 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 f834f25c8a47..686236c9b72b 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 e4594729a768..ba5711013450 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 b1aade0d0d21..3775ab4d79c8 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 383b93f79b54..8cb9987941ee 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 67e3103ae327..16af06107ea1 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 faacc739f914..58418558c70e 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +