From 2d74c31329dca8fc176f99e86ee80f220cf2a682 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 18:04:02 -0800 Subject: [PATCH 01/13] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/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 e50fe2a66d5d..cf144c84c35d 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d7b10dcb8f63..2b1a49fa61d0 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 951e212a44b6..ed357be8d4d7 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7458b8f60279..0f624e3b9c8e 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d7b10dcb8f63..2b1a49fa61d0 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 746645e499c7..f84022e1bc49 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index be5372019978..ba00809b2762 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 34e9dd19ed3a..08ea00239240 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index fe1213882a3e..404338f233bb 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 5cb1b14dea80..520f08e88652 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -22,7 +22,7 @@ - + From a2cbd8e9e6951335aeea837064ae3353ab3e6aaf Mon Sep 17 00:00:00 2001 From: Ben Tian Date: Thu, 8 Jan 2015 18:11:37 +0800 Subject: [PATCH 02/13] Bug 1118163 - Restore received file for small size (1-packet) file, r=shuang --- .../bluedroid/BluetoothOppManager.cpp | 36 +++++++++---------- dom/bluetooth/bluedroid/BluetoothOppManager.h | 3 +- dom/bluetooth/bluez/BluetoothOppManager.cpp | 36 +++++++++---------- dom/bluetooth/bluez/BluetoothOppManager.h | 3 +- .../bluedroid/BluetoothOppManager.cpp | 36 +++++++++---------- .../bluedroid/BluetoothOppManager.h | 3 +- dom/bluetooth2/bluez/BluetoothOppManager.cpp | 36 +++++++++---------- dom/bluetooth2/bluez/BluetoothOppManager.h | 3 +- 8 files changed, 76 insertions(+), 80 deletions(-) diff --git a/dom/bluetooth/bluedroid/BluetoothOppManager.cpp b/dom/bluetooth/bluedroid/BluetoothOppManager.cpp index 0a4d8fbc54be..319660286363 100644 --- a/dom/bluetooth/bluedroid/BluetoothOppManager.cpp +++ b/dom/bluetooth/bluedroid/BluetoothOppManager.cpp @@ -481,8 +481,8 @@ BluetoothOppManager::ConfirmReceivingFile(bool aConfirm) if (success && mPutFinalFlag) { mSuccessFlag = true; + RestoreReceivedFileAndNotify(); FileTransferComplete(); - NotifyAboutFileChange(); } ReplyToPut(mPutFinalFlag, success); @@ -551,7 +551,8 @@ BluetoothOppManager::AfterOppDisconnected() mReadFileThread->Shutdown(); mReadFileThread = nullptr; } - // Release the Mount lock if file transfer completed + + // Release the mount lock if file transfer completed if (mMountLock) { // The mount lock will be implicitly unlocked mMountLock = nullptr; @@ -559,8 +560,14 @@ BluetoothOppManager::AfterOppDisconnected() } void -BluetoothOppManager::RecoverFileName() +BluetoothOppManager::RestoreReceivedFileAndNotify() { + // Remove the empty dummy file + if (mDummyDsFile && mDummyDsFile->mFile) { + mDummyDsFile->mFile->Remove(false); + mDummyDsFile = nullptr; + } + // Remove the trailing ".part" file name from mDsFile by two steps // 1. mDsFile->SetPath() so that the notification sent to Gaia will carry // correct information of the file. @@ -574,16 +581,9 @@ BluetoothOppManager::RecoverFileName() mDsFile->SetPath(path); mDsFile->mFile->RenameTo(nullptr, mFileName); } -} -void -BluetoothOppManager::DeleteDummyFile() -{ - // Remove the empty temp file - if (mDummyDsFile && mDummyDsFile->mFile) { - mDummyDsFile->mFile->Remove(false); - mDummyDsFile = nullptr; - } + // Notify about change of received file + NotifyAboutFileChange(); } void @@ -599,7 +599,11 @@ BluetoothOppManager::DeleteReceivedFile() mDsFile = nullptr; } - DeleteDummyFile(); + // Remove the empty dummy file + if (mDummyDsFile && mDummyDsFile->mFile) { + mDummyDsFile->mFile->Remove(false); + mDummyDsFile = nullptr; + } } bool @@ -956,12 +960,8 @@ BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage) // Success to receive a file and notify completion if (mPutFinalFlag) { mSuccessFlag = true; - - DeleteDummyFile(); - RecoverFileName(); - + RestoreReceivedFileAndNotify(); FileTransferComplete(); - NotifyAboutFileChange(); } } else if (opCode == ObexRequestCode::Get || opCode == ObexRequestCode::GetFinal || diff --git a/dom/bluetooth/bluedroid/BluetoothOppManager.h b/dom/bluetooth/bluedroid/BluetoothOppManager.h index c751a17af5c1..e26fb759cd94 100644 --- a/dom/bluetooth/bluedroid/BluetoothOppManager.h +++ b/dom/bluetooth/bluedroid/BluetoothOppManager.h @@ -85,8 +85,7 @@ private: void ReceivingFileConfirmation(); bool CreateFile(); bool WriteToFile(const uint8_t* aData, int aDataLength); - void RecoverFileName(); - void DeleteDummyFile(); + void RestoreReceivedFileAndNotify(); void DeleteReceivedFile(); void ReplyToConnect(); void ReplyToDisconnectOrAbort(); diff --git a/dom/bluetooth/bluez/BluetoothOppManager.cpp b/dom/bluetooth/bluez/BluetoothOppManager.cpp index 904d6c70442b..8586ad92ec42 100644 --- a/dom/bluetooth/bluez/BluetoothOppManager.cpp +++ b/dom/bluetooth/bluez/BluetoothOppManager.cpp @@ -503,8 +503,8 @@ BluetoothOppManager::ConfirmReceivingFile(bool aConfirm) if (success && mPutFinalFlag) { mSuccessFlag = true; + RestoreReceivedFileAndNotify(); FileTransferComplete(); - NotifyAboutFileChange(); } ReplyToPut(mPutFinalFlag, success); @@ -573,7 +573,8 @@ BluetoothOppManager::AfterOppDisconnected() mReadFileThread->Shutdown(); mReadFileThread = nullptr; } - // Release the Mount lock if file transfer completed + + // Release the mount lock if file transfer completed if (mMountLock) { // The mount lock will be implicitly unlocked mMountLock = nullptr; @@ -581,8 +582,14 @@ BluetoothOppManager::AfterOppDisconnected() } void -BluetoothOppManager::RecoverFileName() +BluetoothOppManager::RestoreReceivedFileAndNotify() { + // Remove the empty dummy file + if (mDummyDsFile && mDummyDsFile->mFile) { + mDummyDsFile->mFile->Remove(false); + mDummyDsFile = nullptr; + } + // Remove the trailing ".part" file name from mDsFile by two steps // 1. mDsFile->SetPath() so that the notification sent to Gaia will carry // correct information of the file. @@ -596,16 +603,9 @@ BluetoothOppManager::RecoverFileName() mDsFile->SetPath(path); mDsFile->mFile->RenameTo(nullptr, mFileName); } -} -void -BluetoothOppManager::DeleteDummyFile() -{ - // Remove the empty temp file - if (mDummyDsFile && mDummyDsFile->mFile) { - mDummyDsFile->mFile->Remove(false); - mDummyDsFile = nullptr; - } + // Notify about change of received file + NotifyAboutFileChange(); } void @@ -621,7 +621,11 @@ BluetoothOppManager::DeleteReceivedFile() mDsFile = nullptr; } - DeleteDummyFile(); + // Remove the empty dummy file + if (mDummyDsFile && mDummyDsFile->mFile) { + mDummyDsFile->mFile->Remove(false); + mDummyDsFile = nullptr; + } } bool @@ -977,12 +981,8 @@ BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage) // Success to receive a file and notify completion if (mPutFinalFlag) { mSuccessFlag = true; - - DeleteDummyFile(); - RecoverFileName(); - + RestoreReceivedFileAndNotify(); FileTransferComplete(); - NotifyAboutFileChange(); } } else if (opCode == ObexRequestCode::Get || opCode == ObexRequestCode::GetFinal || diff --git a/dom/bluetooth/bluez/BluetoothOppManager.h b/dom/bluetooth/bluez/BluetoothOppManager.h index 6d21d144eca8..8b0a29cf2bab 100644 --- a/dom/bluetooth/bluez/BluetoothOppManager.h +++ b/dom/bluetooth/bluez/BluetoothOppManager.h @@ -85,8 +85,7 @@ private: void ReceivingFileConfirmation(); bool CreateFile(); bool WriteToFile(const uint8_t* aData, int aDataLength); - void RecoverFileName(); - void DeleteDummyFile(); + void RestoreReceivedFileAndNotify(); void DeleteReceivedFile(); void ReplyToConnect(); void ReplyToDisconnectOrAbort(); diff --git a/dom/bluetooth2/bluedroid/BluetoothOppManager.cpp b/dom/bluetooth2/bluedroid/BluetoothOppManager.cpp index 0a4d8fbc54be..319660286363 100644 --- a/dom/bluetooth2/bluedroid/BluetoothOppManager.cpp +++ b/dom/bluetooth2/bluedroid/BluetoothOppManager.cpp @@ -481,8 +481,8 @@ BluetoothOppManager::ConfirmReceivingFile(bool aConfirm) if (success && mPutFinalFlag) { mSuccessFlag = true; + RestoreReceivedFileAndNotify(); FileTransferComplete(); - NotifyAboutFileChange(); } ReplyToPut(mPutFinalFlag, success); @@ -551,7 +551,8 @@ BluetoothOppManager::AfterOppDisconnected() mReadFileThread->Shutdown(); mReadFileThread = nullptr; } - // Release the Mount lock if file transfer completed + + // Release the mount lock if file transfer completed if (mMountLock) { // The mount lock will be implicitly unlocked mMountLock = nullptr; @@ -559,8 +560,14 @@ BluetoothOppManager::AfterOppDisconnected() } void -BluetoothOppManager::RecoverFileName() +BluetoothOppManager::RestoreReceivedFileAndNotify() { + // Remove the empty dummy file + if (mDummyDsFile && mDummyDsFile->mFile) { + mDummyDsFile->mFile->Remove(false); + mDummyDsFile = nullptr; + } + // Remove the trailing ".part" file name from mDsFile by two steps // 1. mDsFile->SetPath() so that the notification sent to Gaia will carry // correct information of the file. @@ -574,16 +581,9 @@ BluetoothOppManager::RecoverFileName() mDsFile->SetPath(path); mDsFile->mFile->RenameTo(nullptr, mFileName); } -} -void -BluetoothOppManager::DeleteDummyFile() -{ - // Remove the empty temp file - if (mDummyDsFile && mDummyDsFile->mFile) { - mDummyDsFile->mFile->Remove(false); - mDummyDsFile = nullptr; - } + // Notify about change of received file + NotifyAboutFileChange(); } void @@ -599,7 +599,11 @@ BluetoothOppManager::DeleteReceivedFile() mDsFile = nullptr; } - DeleteDummyFile(); + // Remove the empty dummy file + if (mDummyDsFile && mDummyDsFile->mFile) { + mDummyDsFile->mFile->Remove(false); + mDummyDsFile = nullptr; + } } bool @@ -956,12 +960,8 @@ BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage) // Success to receive a file and notify completion if (mPutFinalFlag) { mSuccessFlag = true; - - DeleteDummyFile(); - RecoverFileName(); - + RestoreReceivedFileAndNotify(); FileTransferComplete(); - NotifyAboutFileChange(); } } else if (opCode == ObexRequestCode::Get || opCode == ObexRequestCode::GetFinal || diff --git a/dom/bluetooth2/bluedroid/BluetoothOppManager.h b/dom/bluetooth2/bluedroid/BluetoothOppManager.h index c751a17af5c1..e26fb759cd94 100644 --- a/dom/bluetooth2/bluedroid/BluetoothOppManager.h +++ b/dom/bluetooth2/bluedroid/BluetoothOppManager.h @@ -85,8 +85,7 @@ private: void ReceivingFileConfirmation(); bool CreateFile(); bool WriteToFile(const uint8_t* aData, int aDataLength); - void RecoverFileName(); - void DeleteDummyFile(); + void RestoreReceivedFileAndNotify(); void DeleteReceivedFile(); void ReplyToConnect(); void ReplyToDisconnectOrAbort(); diff --git a/dom/bluetooth2/bluez/BluetoothOppManager.cpp b/dom/bluetooth2/bluez/BluetoothOppManager.cpp index 8b42d5c02b56..628f1707bc60 100644 --- a/dom/bluetooth2/bluez/BluetoothOppManager.cpp +++ b/dom/bluetooth2/bluez/BluetoothOppManager.cpp @@ -503,8 +503,8 @@ BluetoothOppManager::ConfirmReceivingFile(bool aConfirm) if (success && mPutFinalFlag) { mSuccessFlag = true; + RestoreReceivedFileAndNotify(); FileTransferComplete(); - NotifyAboutFileChange(); } ReplyToPut(mPutFinalFlag, success); @@ -573,7 +573,8 @@ BluetoothOppManager::AfterOppDisconnected() mReadFileThread->Shutdown(); mReadFileThread = nullptr; } - // Release the Mount lock if file transfer completed + + // Release the mount lock if file transfer completed if (mMountLock) { // The mount lock will be implicitly unlocked mMountLock = nullptr; @@ -581,8 +582,14 @@ BluetoothOppManager::AfterOppDisconnected() } void -BluetoothOppManager::RecoverFileName() +BluetoothOppManager::RestoreReceivedFileAndNotify() { + // Remove the empty dummy file + if (mDummyDsFile && mDummyDsFile->mFile) { + mDummyDsFile->mFile->Remove(false); + mDummyDsFile = nullptr; + } + // Remove the trailing ".part" file name from mDsFile by two steps // 1. mDsFile->SetPath() so that the notification sent to Gaia will carry // correct information of the file. @@ -596,16 +603,9 @@ BluetoothOppManager::RecoverFileName() mDsFile->SetPath(path); mDsFile->mFile->RenameTo(nullptr, mFileName); } -} -void -BluetoothOppManager::DeleteDummyFile() -{ - // Remove the empty temp file - if (mDummyDsFile && mDummyDsFile->mFile) { - mDummyDsFile->mFile->Remove(false); - mDummyDsFile = nullptr; - } + // Notify about change of received file + NotifyAboutFileChange(); } void @@ -621,7 +621,11 @@ BluetoothOppManager::DeleteReceivedFile() mDsFile = nullptr; } - DeleteDummyFile(); + // Remove the empty dummy file + if (mDummyDsFile && mDummyDsFile->mFile) { + mDummyDsFile->mFile->Remove(false); + mDummyDsFile = nullptr; + } } bool @@ -977,12 +981,8 @@ BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage) // Success to receive a file and notify completion if (mPutFinalFlag) { mSuccessFlag = true; - - DeleteDummyFile(); - RecoverFileName(); - + RestoreReceivedFileAndNotify(); FileTransferComplete(); - NotifyAboutFileChange(); } } else if (opCode == ObexRequestCode::Get || opCode == ObexRequestCode::GetFinal || diff --git a/dom/bluetooth2/bluez/BluetoothOppManager.h b/dom/bluetooth2/bluez/BluetoothOppManager.h index 6d21d144eca8..8b0a29cf2bab 100644 --- a/dom/bluetooth2/bluez/BluetoothOppManager.h +++ b/dom/bluetooth2/bluez/BluetoothOppManager.h @@ -85,8 +85,7 @@ private: void ReceivingFileConfirmation(); bool CreateFile(); bool WriteToFile(const uint8_t* aData, int aDataLength); - void RecoverFileName(); - void DeleteDummyFile(); + void RestoreReceivedFileAndNotify(); void DeleteReceivedFile(); void ReplyToConnect(); void ReplyToDisconnectOrAbort(); From 680ab4c2587614e1e10fed46d8caaafea6ec18c2 Mon Sep 17 00:00:00 2001 From: dlee Date: Fri, 9 Jan 2015 10:42:48 +0800 Subject: [PATCH 03/13] Bug 1109456 - Support NFC tag transceive WebAPI. r=smaug, yoshi --- dom/nfc/NfcContentHelper.js | 33 ++++++++++++++++++++++ dom/nfc/gonk/Nfc.js | 7 ++++- dom/nfc/gonk/NfcGonkMessage.h | 2 ++ dom/nfc/gonk/NfcMessageHandler.cpp | 54 ++++++++++++++++++++++++++++++++++++ dom/nfc/gonk/NfcMessageHandler.h | 4 ++- dom/nfc/gonk/NfcOptions.h | 13 +++++++++ dom/nfc/gonk/NfcService.cpp | 6 ++++ dom/nfc/nsINfcContentHelper.idl | 27 ++++++++++++++++-- dom/nfc/nsNfc.js | 19 +++++++++++++ dom/webidl/MozNFCTag.webidl | 6 ++++ dom/webidl/NfcOptions.webidl | 6 ++++ 11 files changed, 173 insertions(+), 4 deletions(-) --- dom/nfc/NfcContentHelper.js | 33 ++++++++++++++++++ dom/nfc/gonk/Nfc.js | 7 +++- dom/nfc/gonk/NfcGonkMessage.h | 2 ++ dom/nfc/gonk/NfcMessageHandler.cpp | 54 ++++++++++++++++++++++++++++++ dom/nfc/gonk/NfcMessageHandler.h | 4 ++- dom/nfc/gonk/NfcOptions.h | 13 +++++++ dom/nfc/gonk/NfcService.cpp | 6 ++++ dom/nfc/nsINfcContentHelper.idl | 27 +++++++++++++-- dom/nfc/nsNfc.js | 19 +++++++++++ dom/webidl/MozNFCTag.webidl | 6 ++++ dom/webidl/NfcOptions.webidl | 6 ++++ 11 files changed, 173 insertions(+), 4 deletions(-) diff --git a/dom/nfc/NfcContentHelper.js b/dom/nfc/NfcContentHelper.js index 30fdbf298762..5133050df7e3 100644 --- a/dom/nfc/NfcContentHelper.js +++ b/dom/nfc/NfcContentHelper.js @@ -55,6 +55,7 @@ const NFC_IPC_MSG_NAMES = [ "NFC:WriteNDEFResponse", "NFC:MakeReadOnlyResponse", "NFC:FormatResponse", + "NFC:TransceiveResponse", "NFC:ConnectResponse", "NFC:CloseResponse", "NFC:CheckP2PRegistrationResponse", @@ -174,6 +175,18 @@ NfcContentHelper.prototype = { }); }, + transceive: function transceive(sessionToken, technology, command, callback) { + let requestId = callback.getCallbackId(); + this._requestMap[requestId] = callback; + + cpmm.sendAsyncMessage("NFC:Transceive", { + requestId: requestId, + sessionToken: sessionToken, + technology: technology, + command: command + }); + }, + connect: function connect(techType, sessionToken, callback) { let requestId = callback.getCallbackId(); this._requestMap[requestId] = callback; @@ -280,6 +293,9 @@ NfcContentHelper.prototype = { case "NFC:CheckP2PRegistrationResponse": this.handleCheckP2PRegistrationResponse(result); break; + case "NFC:TransceiveResponse": + this.handleTransceiveResponse(result); + break; case "NFC:ConnectResponse": // Fall through. case "NFC:CloseResponse": case "NFC:WriteNDEFResponse": @@ -394,6 +410,23 @@ NfcContentHelper.prototype = { // The receiver must check the boolean mapped status code to handle. callback.notifySuccessWithBoolean(!result.errorMsg); }, + + handleTransceiveResponse: function handleTransceiveResponse(result) { + let requestId = result.requestId; + let callback = this._requestMap[requestId]; + if (!callback) { + debug("not firing message handleTransceiveResponse for id: " + requestId); + return; + } + delete this._requestMap[requestId]; + + if (result.errorMsg) { + callback.notifyError(result.errorMsg); + return; + } + + callback.notifySuccessWithByteArray(result.response); + }, }; function TagNDEFInfo(tagType, maxNDEFSize, isReadOnly, isFormatable) { diff --git a/dom/nfc/gonk/Nfc.js b/dom/nfc/gonk/Nfc.js index 2afaddd5b8cc..1b3579a94f37 100644 --- a/dom/nfc/gonk/Nfc.js +++ b/dom/nfc/gonk/Nfc.js @@ -65,7 +65,8 @@ const NFC_IPC_MSG_ENTRIES = [ "NFC:Close", "NFC:WriteNDEF", "NFC:MakeReadOnly", - "NFC:Format"] }, + "NFC:Format", + "NFC:Transceive"] }, { permission: "nfc-share", messages: ["NFC:SendFile", @@ -518,6 +519,7 @@ Nfc.prototype = { case "ReadNDEFResponse": case "MakeReadOnlyResponse": case "FormatResponse": + case "TransceiveResponse": case "WriteNDEFResponse": this.sendNfcResponse(message); break; @@ -574,6 +576,9 @@ Nfc.prototype = { case "NFC:Format": this.sendToNfcService("format", message.data); break; + case "NFC:Transceive": + this.sendToNfcService("transceive", message.data); + break; case "NFC:Connect": this.sendToNfcService("connect", message.data); break; diff --git a/dom/nfc/gonk/NfcGonkMessage.h b/dom/nfc/gonk/NfcGonkMessage.h index 5b5ce3cd3ef2..a0215307749c 100644 --- a/dom/nfc/gonk/NfcGonkMessage.h +++ b/dom/nfc/gonk/NfcGonkMessage.h @@ -18,12 +18,14 @@ enum NfcRequest { WriteNDEFReq, MakeReadOnlyReq, FormatReq, + TransceiveReq, }; enum NfcResponse { GeneralRsp = 1000, ChangeRFStateRsp, ReadNDEFRsp, + TransceiveRsp }; enum NfcNotification { diff --git a/dom/nfc/gonk/NfcMessageHandler.cpp b/dom/nfc/gonk/NfcMessageHandler.cpp index 0c44417eb309..73210552d29b 100644 --- a/dom/nfc/gonk/NfcMessageHandler.cpp +++ b/dom/nfc/gonk/NfcMessageHandler.cpp @@ -22,6 +22,7 @@ static const char* kReadNDEFRequest = "readNDEF"; static const char* kWriteNDEFRequest = "writeNDEF"; static const char* kMakeReadOnlyRequest = "makeReadOnly"; static const char* kFormatRequest = "format"; +static const char* kTransceiveRequest = "transceive"; static const char* kConnectRequest = "connect"; static const char* kCloseRequest = "close"; @@ -30,6 +31,7 @@ static const char* kReadNDEFResponse = "ReadNDEFResponse"; static const char* kWriteNDEFResponse = "WriteNDEFResponse"; static const char* kMakeReadOnlyResponse = "MakeReadOnlyResponse"; static const char* kFormatResponse = "FormatResponse"; +static const char* kTransceiveResponse = "TransceiveResponse"; static const char* kConnectResponse = "ConnectResponse"; static const char* kCloseResponse = "CloseResponse"; @@ -58,6 +60,9 @@ NfcMessageHandler::Marshall(Parcel& aParcel, const CommandOptions& aOptions) } else if (!strcmp(type, kFormatRequest)) { result = FormatRequest(aParcel, aOptions); mPendingReqQueue.AppendElement(NfcRequest::FormatReq); + } else if (!strcmp(type, kTransceiveRequest)) { + result = TransceiveRequest(aParcel, aOptions); + mPendingReqQueue.AppendElement(NfcRequest::TransceiveReq); } else if (!strcmp(type, kConnectRequest)) { result = ConnectRequest(aParcel, aOptions); mPendingReqQueue.AppendElement(NfcRequest::ConnectReq); @@ -88,6 +93,9 @@ NfcMessageHandler::Unmarshall(const Parcel& aParcel, EventOptions& aOptions) case NfcResponse::ReadNDEFRsp: result = ReadNDEFResponse(aParcel, aOptions); break; + case NfcResponse::TransceiveRsp: + result = TransceiveResponse(aParcel, aOptions); + break; case NfcNotification::Initialized: result = InitializeNotification(aParcel, aOptions); break; @@ -196,6 +204,24 @@ NfcMessageHandler::ReadNDEFResponse(const Parcel& aParcel, EventOptions& aOption return true; } +bool +NfcMessageHandler::TransceiveResponse(const Parcel& aParcel, EventOptions& aOptions) +{ + aOptions.mType = NS_ConvertUTF8toUTF16(kTransceiveResponse); + aOptions.mErrorCode = aParcel.readInt32(); + aOptions.mSessionId = aParcel.readInt32(); + + NS_ENSURE_TRUE(!mRequestIdQueue.IsEmpty(), false); + aOptions.mRequestId = mRequestIdQueue[0]; + mRequestIdQueue.RemoveElementAt(0); + + if (aOptions.mErrorCode == NfcErrorCode::Success) { + ReadTransceiveResponse(aParcel, aOptions); + } + + return true; +} + bool NfcMessageHandler::WriteNDEFRequest(Parcel& aParcel, const CommandOptions& aOptions) { @@ -225,6 +251,23 @@ NfcMessageHandler::FormatRequest(Parcel& aParcel, const CommandOptions& aOptions return true; } +bool +NfcMessageHandler::TransceiveRequest(Parcel& aParcel, const CommandOptions& aOptions) +{ + aParcel.writeInt32(NfcRequest::TransceiveReq); + aParcel.writeInt32(aOptions.mSessionId); + aParcel.writeInt32(aOptions.mTechnology); + + uint32_t length = aOptions.mCommand.Length(); + aParcel.writeInt32(length); + + void* data = aParcel.writeInplace(length); + memcpy(data, aOptions.mCommand.Elements(), length); + + mRequestIdQueue.AppendElement(aOptions.mRequestId); + return true; +} + bool NfcMessageHandler::ConnectRequest(Parcel& aParcel, const CommandOptions& aOptions) { @@ -374,3 +417,14 @@ NfcMessageHandler::WriteNDEFMessage(Parcel& aParcel, const CommandOptions& aOpti return true; } + +bool +NfcMessageHandler::ReadTransceiveResponse(const Parcel& aParcel, EventOptions& aOptions) +{ + uint32_t length = aParcel.readInt32(); + + aOptions.mResponse.AppendElements( + static_cast(aParcel.readInplace(length)), length); + + return true; +} diff --git a/dom/nfc/gonk/NfcMessageHandler.h b/dom/nfc/gonk/NfcMessageHandler.h index 0068060684db..8963a3b9cda4 100644 --- a/dom/nfc/gonk/NfcMessageHandler.h +++ b/dom/nfc/gonk/NfcMessageHandler.h @@ -32,6 +32,8 @@ private: bool WriteNDEFRequest(android::Parcel& aParcel, const CommandOptions& options); bool MakeReadOnlyRequest(android::Parcel& aParcel, const CommandOptions& options); bool FormatRequest(android::Parcel& aParcel, const CommandOptions& options); + bool TransceiveRequest(android::Parcel& aParcel, const CommandOptions& options); + bool TransceiveResponse(const android::Parcel& aParcel, EventOptions& aOptions); bool ConnectRequest(android::Parcel& aParcel, const CommandOptions& options); bool CloseRequest(android::Parcel& aParcel, const CommandOptions& options); @@ -42,7 +44,7 @@ private: bool ReadNDEFMessage(const android::Parcel& aParcel, EventOptions& aOptions); bool WriteNDEFMessage(android::Parcel& aParcel, const CommandOptions& aOptions); - + bool ReadTransceiveResponse(const android::Parcel& aParcel, EventOptions& aOptions); private: nsTArray mPendingReqQueue; nsTArray mRequestIdQueue; diff --git a/dom/nfc/gonk/NfcOptions.h b/dom/nfc/gonk/NfcOptions.h index d337aedd35e3..bf689216a750 100644 --- a/dom/nfc/gonk/NfcOptions.h +++ b/dom/nfc/gonk/NfcOptions.h @@ -38,6 +38,16 @@ struct CommandOptions COPY_OPT_FIELD(mTechType, 0) COPY_OPT_FIELD(mIsP2P, false) + mTechnology = aOther.mTechnology.WasPassed() ? + static_cast(aOther.mTechnology.Value()) : + -1; + + if (aOther.mCommand.WasPassed()) { + dom::Uint8Array const & currentValue = aOther.mCommand.InternalValue(); + currentValue.ComputeLengthAndData(); + mCommand.AppendElements(currentValue.Data(), currentValue.Length()); + } + if (!aOther.mRecords.WasPassed()) { return; } @@ -80,6 +90,8 @@ struct CommandOptions int32_t mTechType; bool mIsP2P; nsTArray mRecords; + int32_t mTechnology; + nsTArray mCommand; }; struct EventOptions @@ -112,6 +124,7 @@ struct EventOptions int32_t mOriginIndex; nsTArray mAid; nsTArray mPayload; + nsTArray mResponse; }; } // namespace mozilla diff --git a/dom/nfc/gonk/NfcService.cpp b/dom/nfc/gonk/NfcService.cpp index 0faf8e953e43..800c1f006967 100644 --- a/dom/nfc/gonk/NfcService.cpp +++ b/dom/nfc/gonk/NfcService.cpp @@ -198,6 +198,12 @@ public: event.mPayload.Value().Init(Uint8Array::Create(cx, mEvent.mPayload.Length(), mEvent.mPayload.Elements())); } + if (mEvent.mResponse.Length() > 0) { + event.mResponse.Construct(); + event.mResponse.Value().Init( + Uint8Array::Create(cx, mEvent.mResponse.Length(), mEvent.mResponse.Elements())); + } + #undef COPY_FIELD #undef COPY_OPT_FIELD diff --git a/dom/nfc/nsINfcContentHelper.idl b/dom/nfc/nsINfcContentHelper.idl index e44253766996..0e48d56aa003 100644 --- a/dom/nfc/nsINfcContentHelper.idl +++ b/dom/nfc/nsINfcContentHelper.idl @@ -86,7 +86,7 @@ interface nsINfcEventListener : nsISupports void notifyRFStateChange(in DOMString rfState); }; -[scriptable, uuid(a8ef3590-d853-4766-b54a-a4547da4dde4)] +[scriptable, uuid(6c913015-9658-46a9-88d9-6ecfda2bd020)] interface nsINfcRequestCallback : nsISupports { DOMString getCallbackId(); @@ -97,10 +97,12 @@ interface nsINfcRequestCallback : nsISupports void notifySuccessWithNDEFRecords(in nsIVariant records); + void notifySuccessWithByteArray(in nsIVariant array); + void notifyError(in DOMString errorMsg); }; -[scriptable, uuid(c5fdf956-735e-45d3-aa25-3a871bd3e2f8)] +[scriptable, uuid(0f8aae32-9920-491e-a197-8995941d54df)] interface nsINfcContentHelper : nsISupports { void init(in nsIDOMWindow window); @@ -157,6 +159,27 @@ interface nsINfcContentHelper : nsISupports void format(in DOMString sessionToken, in nsINfcRequestCallback callback); + /** + * Send raw command to the tag and receive the response. + * + * @param sessionToken + * Current token + * + * @param technology + * Tag technology + * + * @param command + * Command to send + * + * @param callback + * Called when request is finished + * + */ + void transceive(in DOMString sessionToken, + in DOMString technology, + in nsIVariant command, + in nsINfcRequestCallback callback); + /** * Enable I/O operations to the tag * diff --git a/dom/nfc/nsNfc.js b/dom/nfc/nsNfc.js index 7033155ba7df..dff81518b2f8 100644 --- a/dom/nfc/nsNfc.js +++ b/dom/nfc/nsNfc.js @@ -74,6 +74,15 @@ NfcCallback.prototype = { resolver.resolve(aRecords); }, + notifySuccessWithByteArray: function notifySuccessWithByteArray(aArray) { + let resolver = this.takePromiseResolver(atob(this._requestId)); + if (!resolver) { + debug("can not find promise resolver for id: " + this._requestId); + return; + } + resolver.resolve(aArray); + }, + notifyError: function notifyError(aErrorMsg) { let resolver = this.takePromiseResolver(atob(this._requestId)); if (!resolver) { @@ -192,6 +201,16 @@ MozNFCTagImpl.prototype = { return callback.promise; }, + transceive: function transceive(tech, cmd) { + if (this.isLost) { + throw new this._window.DOMError("InvalidStateError", "NFCTag object is invalid"); + } + + let callback = new NfcCallback(this._window); + this._nfcContentHelper.transceive(this.session, tech, cmd, callback); + return callback.promise; + }, + notifyLost: function notifyLost() { this.isLost = true; }, diff --git a/dom/webidl/MozNFCTag.webidl b/dom/webidl/MozNFCTag.webidl index 07f564b4ef05..f89056270649 100644 --- a/dom/webidl/MozNFCTag.webidl +++ b/dom/webidl/MozNFCTag.webidl @@ -109,4 +109,10 @@ partial interface MozNFCTag { [ChromeOnly] void notifyLost(); + + /** + * Send raw command to tag and receive the response. + */ + [ChromeOnly, Throws] + Promise transceive(NFCTechType tech, Uint8Array command); }; diff --git a/dom/webidl/NfcOptions.webidl b/dom/webidl/NfcOptions.webidl index 7ff86b06fa32..758ddb798e86 100644 --- a/dom/webidl/NfcOptions.webidl +++ b/dom/webidl/NfcOptions.webidl @@ -21,6 +21,9 @@ dictionary NfcCommandOptions boolean isP2P; sequence records; + + NFCTechType technology; + Uint8Array command; }; dictionary NfcEventOptions @@ -51,4 +54,7 @@ dictionary NfcEventOptions DOMString origin; Uint8Array aid; Uint8Array payload; + + // Tag transceive response data + Uint8Array response; }; From 7ebc17d436a05a086cc722fbe1d846b60f63b0d0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 19:02:15 -0800 Subject: [PATCH 04/13] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/31dadd978219 Author: Kevin Grandon Desc: Merge pull request #27210 from KevinGrandon/bug_1118891_remove_geolocation_request Bug 1118891 - [E.me] Remove geolocation request from api helper ======== https://hg.mozilla.org/integration/gaia-central/rev/ba17799efa0b Author: Kevin Grandon Desc: Bug 1118891 - [E.me] Remove geolocation request from api helper r=crdlc ======== https://hg.mozilla.org/integration/gaia-central/rev/9880d46209dd Author: Greg Weng Desc: Revert "Merge pull request #27052 from snowmantw/bug1116091-rev2" This reverts commit 12d74b902d356f94837bcf0edcd4f4089f77207d, reversing changes made to 91bd809dc8c3f0f600b782f09443be4d954e9ff9. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index bab9fc8a9258..3f6fdd497445 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "85bbbd703dba85b58c5b9d5902bc784c9f763c1d", + "revision": "31dadd9782191eff4f5cc01e6169279727ed76d6", "repo_path": "integration/gaia-central" } From b87f4b7e726bdbecdfa646eaf284f1bf652ce75a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 19:06:54 -0800 Subject: [PATCH 05/13] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index cf144c84c35d..fae2ba84d241 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 2b1a49fa61d0..ead7a3b4916f 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 ed357be8d4d7..306e54f64cf1 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 0f624e3b9c8e..0e8fa5a3e242 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2b1a49fa61d0..ead7a3b4916f 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 f84022e1bc49..7bd9695dc10c 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 ba00809b2762..74ac2820121b 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 08ea00239240..fec2b2bcc19e 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 6d2a6fb4c279..c62815a0b64d 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 404338f233bb..bd7030e8de68 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 520f08e88652..a4f00292b77a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 52a7bacb3d89bbc95a028923621023918cfdcd65 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 19:17:27 -0800 Subject: [PATCH 06/13] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f3ba8a176128 Author: Kevin Grandon Desc: Merge pull request #27244 from takenspc/bug1060915 Bug 1060915 - Accept view-source:protocol r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/a689e445941d Author: Takeshi Kurosawa Desc: Bug 1060915 - Accept view-source:protocol --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 3f6fdd497445..a40a3b705cf3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "31dadd9782191eff4f5cc01e6169279727ed76d6", + "revision": "f3ba8a176128b9b6b2db85e20c967b60c22f3ca7", "repo_path": "integration/gaia-central" } From 3f5eb2b00700157be94fa6e443199756d24b5751 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 19:22:06 -0800 Subject: [PATCH 07/13] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index fae2ba84d241..faa1e7a17ca4 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 ead7a3b4916f..807ac8da35b5 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 306e54f64cf1..96ff1065feac 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 0e8fa5a3e242..2bc864f96cbc 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index ead7a3b4916f..807ac8da35b5 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 7bd9695dc10c..a36eb06cc4d3 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 74ac2820121b..1083408454d6 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index fec2b2bcc19e..1f321735e920 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index c62815a0b64d..ef131ad8b07c 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index bd7030e8de68..8c438532a852 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index a4f00292b77a..13f5fb703c3e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From dbc7b1d654d7292adb7a46677ed2ca24b8f9b912 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 19:32:15 -0800 Subject: [PATCH 08/13] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fb9c19e72876 Author: Kevin Grandon Desc: Merge pull request #27215 from KevinGrandon/bug_1113050_action_menu_zindex Bug 1113050 - Increase action menu z-index to cover gesture-panel r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/f03f5d84b1c1 Author: Kevin Grandon Desc: Bug 1113050 - Increase action menu z-index to cover gesture-panel r=alive --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a40a3b705cf3..cffdb0a90e55 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f3ba8a176128b9b6b2db85e20c967b60c22f3ca7", + "revision": "fb9c19e728760c4faf6e800c18dd35abf9061fbf", "repo_path": "integration/gaia-central" } From 8f2e816a91ea04588ecfb17b016b6eeb2f8d5125 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 19:36:53 -0800 Subject: [PATCH 09/13] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index faa1e7a17ca4..b161e7bd5f2f 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 807ac8da35b5..72a8ccccf075 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 96ff1065feac..81580665c8d4 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 2bc864f96cbc..f72fd289080a 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 807ac8da35b5..72a8ccccf075 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 a36eb06cc4d3..2c81b435cd1f 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 1083408454d6..aee29de4f84e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 1f321735e920..b4f98eb96d24 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index ef131ad8b07c..97d5381de4c0 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 8c438532a852..83a6c986054c 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 13f5fb703c3e..269004c1d451 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From d044927d3d9a4ddd3216755887fa1264c254cb54 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 19:47:31 -0800 Subject: [PATCH 10/13] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/eb5610c19cae Author: John Hu Desc: Merge pull request #27222 from huchengtw-moz/bug-1115273-open-search-bar Bug 1115273 - [Stingray][smart-home/smart-system] Implement opening sear..., r=dwi2 ======== https://hg.mozilla.org/integration/gaia-central/rev/52bee514ee5b Author: John Hu Desc: Bug 1115273 - [Stingray][smart-home/smart-system] Implement opening search bar --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index cffdb0a90e55..e90b6cb14c7e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "fb9c19e728760c4faf6e800c18dd35abf9061fbf", + "revision": "eb5610c19caeb363bdcec3458aa87dde204abc7e", "repo_path": "integration/gaia-central" } From 6aa9bfccd83a0d8d31d5d302c2848314eccb6ecd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 19:51:40 -0800 Subject: [PATCH 11/13] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index b161e7bd5f2f..d9975e9fe071 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 72a8ccccf075..1f7b5721e9b6 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 81580665c8d4..cec113a355d7 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 f72fd289080a..60de2e93dba5 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 72a8ccccf075..1f7b5721e9b6 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 2c81b435cd1f..2b32376d5cfe 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 aee29de4f84e..ec67efea9476 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index b4f98eb96d24..5b865aba65ae 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 97d5381de4c0..67115481a108 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 83a6c986054c..b8e320c90c81 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 269004c1d451..4a271ba241ec 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 017bb9d6b1dc5a6190094686606e604de053bd00 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 21:22:16 -0800 Subject: [PATCH 12/13] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/de2fb8cf47d9 Author: Kevin Grandon Desc: Revert "Bug 1060915 - Accept view-source:protocol" This reverts commit 4417a3ad0cd311f5ca856655d71f9355c4c93467. ======== https://hg.mozilla.org/integration/gaia-central/rev/430af407fdb1 Author: George Desc: Merge pull request #27239 from cctuan/1118174 Bug 1118174 - [TextSelection] Copypaste bubble should not show on the front of utility_tray ======== https://hg.mozilla.org/integration/gaia-central/rev/9d05647a7f62 Author: cctuan Desc: Bug 1118174 - [TextSelection] Copypaste bubble should not show on the front of utility_tray --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e90b6cb14c7e..55db5712d215 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "eb5610c19caeb363bdcec3458aa87dde204abc7e", + "revision": "de2fb8cf47d91fa533d1228d31aeddae9d968b1e", "repo_path": "integration/gaia-central" } From 3b9995d7ea067fdf20be44c1ad0c43b8872539f7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 8 Jan 2015 21:26:54 -0800 Subject: [PATCH 13/13] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d9975e9fe071..eb3e7e2c0ecb 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 1f7b5721e9b6..58d0d865d2ce 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 cec113a355d7..d5108acd4047 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 60de2e93dba5..c1fa5cde74e0 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 1f7b5721e9b6..58d0d865d2ce 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 2b32376d5cfe..39ed56fba72d 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 ec67efea9476..0de272eada19 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 5b865aba65ae..42e478fa1793 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 67115481a108..76c227851efb 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b8e320c90c81..4cbffc651654 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 4a271ba241ec..6260f1b13e67 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +