summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-06-10 11:36:13 -0700
committerNick Pelly <npelly@google.com>2011-06-10 15:22:28 -0700
commit195c39cbcee2ba9d9d532359bcf8bd7a01205911 (patch)
tree7beaabeaec71b2021979e8622d88a7eea6876733
parent31bc2f92520aea11b8a339a1ad9ec998cc90c59d (diff)
downloadframeworks_base-195c39cbcee2ba9d9d532359bcf8bd7a01205911.zip
frameworks_base-195c39cbcee2ba9d9d532359bcf8bd7a01205911.tar.gz
frameworks_base-195c39cbcee2ba9d9d532359bcf8bd7a01205911.tar.bz2
NFC: Submit the missing pieces of previous commit to fix build.
(remove stale code) Change-Id: I0d08650b6d694ac4493cf0074696d4e1be7d9f87
-rw-r--r--core/java/android/nfc/INfcAdapter.aidl2
-rwxr-xr-xcore/java/android/nfc/INfcAdapterExtras.aidl2
-rw-r--r--nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java16
3 files changed, 0 insertions, 20 deletions
diff --git a/core/java/android/nfc/INfcAdapter.aidl b/core/java/android/nfc/INfcAdapter.aidl
index d11fea0..dcbe9da 100644
--- a/core/java/android/nfc/INfcAdapter.aidl
+++ b/core/java/android/nfc/INfcAdapter.aidl
@@ -62,6 +62,4 @@ interface INfcAdapter
int createLlcpSocket(int sap, int miu, int rw, int linearBufferLength);
boolean disable();
boolean enable();
- String getProperties(String param);
- int setProperties(String param, String value);
}
diff --git a/core/java/android/nfc/INfcAdapterExtras.aidl b/core/java/android/nfc/INfcAdapterExtras.aidl
index 8677a50..3f8b856 100755
--- a/core/java/android/nfc/INfcAdapterExtras.aidl
+++ b/core/java/android/nfc/INfcAdapterExtras.aidl
@@ -29,6 +29,4 @@ interface INfcAdapterExtras {
Bundle transceive(in byte[] data_in);
int getCardEmulationRoute();
void setCardEmulationRoute(int route);
- void registerTearDownApdus(String packageName, in ApduList apdu);
- void unregisterTearDownApdus(String packageName);
}
diff --git a/nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java b/nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java
index 6001be9..7775dbf 100644
--- a/nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java
+++ b/nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java
@@ -207,20 +207,4 @@ public final class NfcAdapterExtras {
public NfcExecutionEnvironment getEmbeddedExecutionEnvironment() {
return sEmbeddedEe;
}
-
- public void registerTearDownApdus(String packageName, ApduList apdus) {
- try {
- sService.registerTearDownApdus(packageName, apdus);
- } catch (RemoteException e) {
- attemptDeadServiceRecovery(e);
- }
- }
-
- public void unregisterTearDownApdus(String packageName) {
- try {
- sService.unregisterTearDownApdus(packageName);
- } catch (RemoteException e) {
- attemptDeadServiceRecovery(e);
- }
- }
}