diff options
| author | Sunil Jogi <sunil.jogi@nxp.com> | 2012-04-10 13:12:26 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-04-20 12:11:57 -0700 |
| commit | 3bba8d0457408421a6468f03bbb36e9ff32b81cf (patch) | |
| tree | a3744e19c1bef6b865f737f9453dbfe9f1ae4767 /core/java/android | |
| parent | a94afeb5b3c3c95c6d2cf0cd4d69587aba569cfb (diff) | |
| download | frameworks_base-3bba8d0457408421a6468f03bbb36e9ff32b81cf.zip frameworks_base-3bba8d0457408421a6468f03bbb36e9ff32b81cf.tar.gz frameworks_base-3bba8d0457408421a6468f03bbb36e9ff32b81cf.tar.bz2 | |
Added NFC disable during phone shutdown
NFC was not disabled/deinitialized when phone shutdown. This patch
add NFC disable on phone shutdown which can complete any pending
NFC transaction before phone shutdown.
Change-Id: Id1e604be7c34adec8623a1e526d8ff99e18bf74b
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; |