Merge "Get rid of getLastError()."

3 files changed, 2 insertions, 9 deletions

diff --git a/src/com/android/nfc/DeviceHost.java b/src/com/android/nfc/DeviceHost.java
index 8081f3c..82c711c 100644
--- a/src/com/android/nfc/DeviceHost.java
+++ b/src/com/android/nfc/DeviceHost.java
@@ -185,8 +185,6 @@ public interface DeviceHost {
 
     public void doDeselectSecureElement();
 
-    public int doGetLastError();
-
     public LlcpConnectionlessSocket createLlcpConnectionlessSocket(int nSap, String sn)
             throws LlcpException;
 
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 10cd1ad..660126c 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1055,11 +1055,6 @@ public class NfcService extends Application implements DeviceHostListener {
         }
 
         @Override
-        public int getLastError(int nativeHandle) throws RemoteException {
-            return(mDeviceHost.doGetLastError());
-        }
-
-        @Override
         public boolean ndefIsWritable(int nativeHandle) throws RemoteException {
             throw new UnsupportedOperationException();
         }
diff --git a/src/com/android/nfc/nxp/NativeNfcManager.java b/src/com/android/nfc/nxp/NativeNfcManager.java
index 2573ff6..25a6b87 100755
--- a/src/com/android/nfc/nxp/NativeNfcManager.java
+++ b/src/com/android/nfc/nxp/NativeNfcManager.java
@@ -66,6 +66,8 @@ public class NativeNfcManager implements DeviceHost {
 
     private native boolean doDownload();
 
+    public native int doGetLastError();
+
     @Override
     public void checkFirmware() {
         // Check that the NFC controller firmware is up to date.  This
@@ -131,8 +133,6 @@ public class NativeNfcManager implements DeviceHost {
     @Override
     public native void doDeselectSecureElement();
 
-    @Override
-    public native int doGetLastError();
 
     private native NativeLlcpConnectionlessSocket doCreateLlcpConnectionlessSocket(int nSap,
             String sn);