Support for getTimeout() (NFC service).

Bug: 4492175
Change-Id: I289e40d1527e7b570e8fd46f9968094b92a31902

3 files changed, 14 insertions, 0 deletions

diff --git a/src/com/android/nfc/DeviceHost.java b/src/com/android/nfc/DeviceHost.java
index 4456d98..9693446 100644
--- a/src/com/android/nfc/DeviceHost.java
+++ b/src/com/android/nfc/DeviceHost.java
@@ -151,4 +151,6 @@ public interface DeviceHost {
     public void resetTimeouts();
 
     public boolean setTimeout(int technology, int timeout);
+
+    public int getTimeout(int technology);
 }
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 31e9a60..10f4115 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1407,6 +1407,13 @@ public class NfcService extends Application implements DeviceHostListener {
         }
 
         @Override
+        public int getTimeout(int tech) throws RemoteException {
+            mContext.enforceCallingOrSelfPermission(NFC_PERM, NFC_PERM_ERROR);
+
+            return mDeviceHost.getTimeout(tech);
+        }
+
+        @Override
         public void resetTimeouts() throws RemoteException {
             mContext.enforceCallingOrSelfPermission(NFC_PERM, NFC_PERM_ERROR);
 
diff --git a/src/com/android/nfc/nxp/NativeNfcManager.java b/src/com/android/nfc/nxp/NativeNfcManager.java
index 59a1ac1..8a59370 100755
--- a/src/com/android/nfc/nxp/NativeNfcManager.java
+++ b/src/com/android/nfc/nxp/NativeNfcManager.java
@@ -100,6 +100,11 @@ public class NativeNfcManager implements DeviceHost {
         return doSetTimeout(tech, timeout);
     }
 
+    private native int doGetTimeout(int tech);
+    @Override
+    public int getTimeout(int tech) {
+        return doGetTimeout(tech);
+    }
 
     /**
      * Notifies Ndef Message (TODO: rename into notifyTargetDiscovered)