diff options
| author | Martijn Coenen <maco@google.com> | 2011-07-21 00:32:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-21 00:32:04 -0700 |
| commit | bb685417895d440e1e3a5f19bbbe36139db3fd9a (patch) | |
| tree | d2c63d9261350490f4b7185fa8cacc3f8ac7097c /src/com/android/nfc/NfcService.java | |
| parent | df55e2912aed6fc81b19958f1b825e7d693d5cf3 (diff) | |
| parent | 358d8b6ad611aba11e69a3b1dd9d132dbc9a7605 (diff) | |
| download | packages_apps_nfc-bb685417895d440e1e3a5f19bbbe36139db3fd9a.zip packages_apps_nfc-bb685417895d440e1e3a5f19bbbe36139db3fd9a.tar.gz packages_apps_nfc-bb685417895d440e1e3a5f19bbbe36139db3fd9a.tar.bz2 | |
Merge "Support for getTimeout() (NFC service)."
Diffstat (limited to 'src/com/android/nfc/NfcService.java')
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 779e7c8..1edf6d6 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -1350,6 +1350,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); |