Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1237493 - [NFC] Separate Gecko and Gonk layers for accessing Androids properties. r=yoshi

Browse Source
This commit is contained in:
Thomas Nguyen 2016-01-25 22:27:00 -05:00
parent 71e9800283
commit e36dc39027
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/nfc/gonk/NfcService.cpp
View File

@ -6,12 +6,12 @@
#include "NfcService.h"
#include <binder/Parcel.h>
#include <cutils/properties.h>
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/dom/NfcOptionsBinding.h"
#include "mozilla/dom/ToJSValue.h"
#include "mozilla/dom/RootedDictionary.h"
#include "mozilla/Endian.h"
#include "mozilla/Hal.h"
#include "mozilla/ipc/ListenSocket.h"
#include "mozilla/ipc/ListenSocketConsumer.h"
#include "mozilla/ipc/NfcConnector.h"
@ -32,6 +32,7 @@
using namespace android;
using namespace mozilla::dom;
using namespace mozilla::ipc;
using namespace mozilla::hal;
namespace mozilla {
@ -109,7 +110,7 @@ NfcConsumer::Start()
// If we could not cleanup properly before and an old
// instance of the daemon is still running, we kill it
// here.
Unused << NS_WARN_IF(property_set("ctl.stop", "nfcd") < 0);
StopSystemService("nfcd");
mHandler = new NfcMessageHandler();
@ -377,9 +378,10 @@ NfcConsumer::OnConnectSuccess(int aIndex)
switch (aIndex) {
case LISTEN_SOCKET: {
nsCString value("nfcd:-S -a ");
value.Append(mListenSocketName);
if (NS_WARN_IF(property_set("ctl.start", value.get()) < 0)) {
nsCString args("-S -a ");
args.Append(mListenSocketName);
nsresult rv = StartSystemService("nfcd", args.get());
if (NS_FAILED(rv)) {
OnConnectError(STREAM_SOCKET);
}
break;