1 files changed, 9 insertions, 30 deletions
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
index a69e3b53..9d2ebeae 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -27,6 +27,7 @@ import android.nfc.ErrorCodes;
 import android.nfc.tech.Ndef;
 import android.nfc.tech.TagTechnology;
 import android.util.Log;
+import com.android.nfc.NfcDiscoveryParameters;
 
 import java.io.File;
 
@@ -151,23 +152,18 @@ public class NativeNfcManager implements DeviceHost {
        return false;
     }
 
+    private native void doEnableDiscovery(int techMask,
+                                          boolean enableLowPowerPolling,
+                                          boolean enableReaderMode,
+                                          boolean restart);
     @Override
-    public native void enableDiscovery(int techMask, boolean enableLowPowerDiscovery);
-
-    @Override
-    public native void disableDiscovery();
-
-    @Override
-    public void enableRoutingToHost()
-    {
-
+    public void enableDiscovery(NfcDiscoveryParameters params, boolean restart) {
+        doEnableDiscovery(params.getTechMask(), params.shouldEnableLowPowerDiscovery(),
+                params.shouldEnableReaderMode(), restart);
     }
 
     @Override
-    public void disableRoutingToHost()
-    {
-
-    }
+    public native void disableDiscovery();
 
     private native NativeLlcpConnectionlessSocket doCreateLlcpConnectionlessSocket(int nSap,
             String sn);
@@ -315,18 +311,6 @@ public class NativeNfcManager implements DeviceHost {
         doSetP2pTargetModes(modes);
     }
 
-    private native void doEnableReaderMode(int technologies);
-    public boolean enableReaderMode(int technologies) {
-        doEnableReaderMode(technologies);
-        return true;
-    }
-
-    private native void doDisableReaderMode();
-    public boolean disableReaderMode() {
-        doDisableReaderMode();
-        return true;
-    }
-
     @Override
     public boolean enableScreenOffSuspend() {
         // Snooze mode not supported on NXP silicon
@@ -348,11 +332,6 @@ public class NativeNfcManager implements DeviceHost {
     }
 
     @Override
-    public boolean enablePN544Quirks() {
-        return true;
-    }
-
-    @Override
     public int getDefaultLlcpMiu() {
         return DEFAULT_LLCP_MIU;
     }