Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-14 22:13:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1098253 - get rfState from nfcd. r=dimi

Browse Source 
From 2c8fd495054e6bd3bd93561e20518a47f6f6bc64 Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/NfcGonkMessage.h      | 2 +-
 dom/nfc/gonk/NfcMessageHandler.cpp | 5 +----
 dom/nfc/gonk/NfcMessageHandler.h   | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)
This commit is contained in:
Yoshi Huang 2014-11-13 19:20:37 +08:00
parent 51445b181a
commit 65bd5d6b15
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/nfc/gonk/NfcGonkMessage.h
View File

@ -8,7 +8,7 @@
namespace mozilla {
#define NFCD_MAJOR_VERSION 1
#define NFCD_MINOR_VERSION 15
#define NFCD_MINOR_VERSION 16
enum NfcRequest {
ChangeRFStateReq = 0,

5
dom/nfc/gonk/NfcMessageHandler.cpp
View File

@ -144,7 +144,6 @@ NfcMessageHandler::ChangeRFStateRequest(Parcel& aParcel, const CommandOptions& a
aParcel.writeInt32(NfcRequest::ChangeRFStateReq);
aParcel.writeInt32(aOptions.mRfState);
mRequestIdQueue.AppendElement(aOptions.mRequestId);
mRfStateQueue.AppendElement(aOptions.mRfState);
return true;
}
@ -157,9 +156,7 @@ NfcMessageHandler::ChangeRFStateResponse(const Parcel& aParcel, EventOptions& aO
aOptions.mRequestId = mRequestIdQueue[0];
mRequestIdQueue.RemoveElementAt(0);
NS_ENSURE_TRUE(!mRfStateQueue.IsEmpty(), false);
aOptions.mRfState = mRfStateQueue[0];
mRfStateQueue.RemoveElementAt(0);
aOptions.mRfState = aParcel.readInt32();
return true;
}

1
dom/nfc/gonk/NfcMessageHandler.h
View File

@ -45,7 +45,6 @@ private:
private:
nsTArray<int32_t> mPendingReqQueue;
nsTArray<nsString> mRequestIdQueue;
nsTArray<int32_t> mRfStateQueue;
};
} // namespace mozilla