From 195c39cbcee2ba9d9d532359bcf8bd7a01205911 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Fri, 10 Jun 2011 11:36:13 -0700 Subject: [PATCH] NFC: Submit the missing pieces of previous commit to fix build. (remove stale code) Change-Id: I0d08650b6d694ac4493cf0074696d4e1be7d9f87 --- core/java/android/nfc/INfcAdapter.aidl | 2 -- core/java/android/nfc/INfcAdapterExtras.aidl | 2 -- .../com/android/nfc_extras/NfcAdapterExtras.java | 16 ---------------- 3 files changed, 20 deletions(-) diff --git a/core/java/android/nfc/INfcAdapter.aidl b/core/java/android/nfc/INfcAdapter.aidl index d11fea0a11c4b..dcbe9dab117cc 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 8677a503b270d..3f8b8563b6af7 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 6001be92a322c..7775dbf9167a6 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); - } - } }