diff options
author | Andres Morales <anmorales@google.com> | 2014-07-30 21:30:50 +0000 |
---|---|---|
committer | Andres Morales <anmorales@google.com> | 2014-07-30 21:30:50 +0000 |
commit | 92b4b3c64ddbec9d10b631e03f0fbba225ca9057 (patch) | |
tree | 55d38b9dbf80365e1105d0179e14cab7d9a5ef63 /core/java/android | |
parent | 131197aa6e6b0ae91fefe4bb5f39fffb780997c5 (diff) | |
download | frameworks_base-92b4b3c64ddbec9d10b631e03f0fbba225ca9057.zip frameworks_base-92b4b3c64ddbec9d10b631e03f0fbba225ca9057.tar.gz frameworks_base-92b4b3c64ddbec9d10b631e03f0fbba225ca9057.tar.bz2 |
Revert "NFC Unlock api changes"
This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.
Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/nfc/INfcAdapter.aidl | 3 | ||||
-rw-r--r-- | core/java/android/nfc/INfcUnlockHandler.aidl | 12 | ||||
-rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 89 | ||||
-rw-r--r-- | core/java/android/nfc/Tag.java | 2 |
4 files changed, 3 insertions, 103 deletions
diff --git a/core/java/android/nfc/INfcAdapter.aidl b/core/java/android/nfc/INfcAdapter.aidl index ee4d45e..541b700 100644 --- a/core/java/android/nfc/INfcAdapter.aidl +++ b/core/java/android/nfc/INfcAdapter.aidl @@ -27,7 +27,6 @@ import android.nfc.INfcAdapterExtras; import android.nfc.INfcTag; import android.nfc.INfcCardEmulation; import android.nfc.INfcLockscreenDispatch; -import android.nfc.INfcUnlockHandler; import android.os.Bundle; /** @@ -58,6 +57,4 @@ interface INfcAdapter void setP2pModes(int initatorModes, int targetModes); void registerLockscreenDispatch(INfcLockscreenDispatch lockscreenDispatch, in int[] techList); - void addNfcUnlockHandler(INfcUnlockHandler unlockHandler, in int[] techList); - void removeNfcUnlockHandler(IBinder b); } diff --git a/core/java/android/nfc/INfcUnlockHandler.aidl b/core/java/android/nfc/INfcUnlockHandler.aidl deleted file mode 100644 index e1cace9..0000000 --- a/core/java/android/nfc/INfcUnlockHandler.aidl +++ /dev/null @@ -1,12 +0,0 @@ -package android.nfc; - -import android.nfc.Tag; - -/** - * @hide - */ -interface INfcUnlockHandler { - - boolean onUnlockAttempted(in Tag tag); - -} diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index dde2cf1..ad785ed 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -30,6 +30,7 @@ import android.content.IntentFilter; import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.net.Uri; +import android.nfc.BeamShareData; import android.nfc.tech.MifareClassic; import android.nfc.tech.Ndef; import android.nfc.tech.NfcA; @@ -311,8 +312,6 @@ public final class NfcAdapter { final NfcActivityManager mNfcActivityManager; final Context mContext; - final HashMap<NfcUnlockHandler, IBinder> mNfcUnlockHandlers; - final Object mLock; /** * A callback to be invoked when the system finds a tag while the foreground activity is @@ -395,22 +394,6 @@ public final class NfcAdapter { /** - * A callback to be invoked when an application has registered as a - * handler to unlock the device given an NFC tag at the lockscreen. - * @hide - */ - @SystemApi - public interface NfcUnlockHandler { - /** - * Called at the lock screen to attempt to unlock the device with the given tag. - * @param tag the detected tag, to be used to unlock the device - * @return true if the device was successfully unlocked - */ - public boolean onUnlockAttempted(Tag tag); - } - - - /** * Helper to check if this device has FEATURE_NFC, but without using * a context. * Equivalent to @@ -542,8 +525,6 @@ public final class NfcAdapter { NfcAdapter(Context context) { mContext = context; mNfcActivityManager = new NfcActivityManager(this); - mNfcUnlockHandlers = new HashMap<NfcUnlockHandler, IBinder>(); - mLock = new Object(); } /** @@ -1476,50 +1457,7 @@ public final class NfcAdapter { public boolean onTagDetected(Tag tag) throws RemoteException { return lockscreenDispatch.onTagDetected(tag); } - }, Tag.getTechCodesFromStrings(techList)); - } catch (RemoteException e) { - attemptDeadServiceRecovery(e); - return false; - } catch (IllegalArgumentException e) { - Log.e(TAG, "Unable to register LockscreenDispatch", e); - return false; - } - - return true; - } - - /** - * Registers a new NFC unlock handler with the NFC service. - * - * <p />NFC unlock handlers are intended to unlock the keyguard in the presence of a trusted - * NFC device. The handler should return true if it successfully authenticates the user and - * unlocks the keyguard. - * - * <p /> The parameter {@code tagTechnologies} determines which Tag technologies will be polled for - * at the lockscreen. Polling for less tag technologies reduces latency, and so it is - * strongly recommended to only provide the Tag technologies that the handler is expected to - * receive. - * - * @hide - */ - @SystemApi - public boolean addNfcUnlockHandler(final NfcUnlockHandler unlockHandler, - String[] tagTechnologies) { - try { - INfcUnlockHandler.Stub iHandler = new INfcUnlockHandler.Stub() { - @Override - public boolean onUnlockAttempted(Tag tag) throws RemoteException { - return unlockHandler.onUnlockAttempted(tag); - } - }; - - synchronized (mLock) { - if (mNfcUnlockHandlers.containsKey(unlockHandler)) { - return true; - } - sService.addNfcUnlockHandler(iHandler, Tag.getTechCodesFromStrings(tagTechnologies)); - mNfcUnlockHandlers.put(unlockHandler, iHandler.asBinder()); - } + }, Tag.techListFromStrings(techList)); } catch (RemoteException e) { attemptDeadServiceRecovery(e); return false; @@ -1532,29 +1470,6 @@ public final class NfcAdapter { } /** - * Removes a previously registered unlock handler. Also removes the tag technologies - * associated with the removed unlock handler. - * - * @hide - */ - @SystemApi - public boolean removeNfcUnlockHandler(NfcUnlockHandler unlockHandler) { - try { - synchronized (mLock) { - if (mNfcUnlockHandlers.containsKey(unlockHandler)) { - sService.removeNfcUnlockHandler(mNfcUnlockHandlers.get(unlockHandler)); - mNfcUnlockHandlers.remove(unlockHandler); - } - - return true; - } - } catch (RemoteException e) { - attemptDeadServiceRecovery(e); - return false; - } - } - - /** * @hide */ public INfcAdapterExtras getNfcAdapterExtrasInterface() { diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java index 154d5a1..43be702 100644 --- a/core/java/android/nfc/Tag.java +++ b/core/java/android/nfc/Tag.java @@ -196,7 +196,7 @@ public final class Tag implements Parcelable { return strings; } - static int[] getTechCodesFromStrings(String[] techStringList) throws IllegalArgumentException { + static int[] techListFromStrings(String[] techStringList) throws IllegalArgumentException { if (techStringList == null) { throw new IllegalArgumentException("List cannot be null"); } |