Merge "NFC: Submit the missing pieces of previous commit to fix build."

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);
 }

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);
-        }
-    }
 }