diff options
| author | Martijn Coenen <maco@google.com> | 2012-04-20 13:05:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-20 13:05:04 -0700 |
| commit | e81e3a4f85147ada753100b8a78584ce008d9e63 (patch) | |
| tree | dd60c9acb8cf09d11a0c014653fff5dc7ce80c41 /core/java/android | |
| parent | 48b6b711a772893ba080d84b6cd3df0e5aa70ee2 (diff) | |
| parent | 3bba8d0457408421a6468f03bbb36e9ff32b81cf (diff) | |
| download | frameworks_base-e81e3a4f85147ada753100b8a78584ce008d9e63.zip frameworks_base-e81e3a4f85147ada753100b8a78584ce008d9e63.tar.gz frameworks_base-e81e3a4f85147ada753100b8a78584ce008d9e63.tar.bz2 | |
Merge "Added NFC disable during phone shutdown"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/nfc/INfcAdapter.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/nfc/INfcAdapter.aidl b/core/java/android/nfc/INfcAdapter.aidl index ddd00a4..39810ba 100644 --- a/core/java/android/nfc/INfcAdapter.aidl +++ b/core/java/android/nfc/INfcAdapter.aidl @@ -34,7 +34,7 @@ interface INfcAdapter INfcAdapterExtras getNfcAdapterExtrasInterface(in String pkg); int getState(); - boolean disable(); + boolean disable(boolean saveState); boolean enable(); boolean enableNdefPush(); boolean disableNdefPush(); diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 90f5bef..7bf9feb 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -574,9 +574,10 @@ public final class NfcAdapter { * * @hide */ + public boolean disable() { try { - return sService.disable(); + return sService.disable(true); } catch (RemoteException e) { attemptDeadServiceRecovery(e); return false; |