diff options
| author | Martijn Coenen <maco@google.com> | 2011-10-21 16:31:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-21 16:31:37 -0700 |
| commit | 94dc4266b48f757d39ed0396bf0af86cea7c206a (patch) | |
| tree | e0f214c6a802c8095a3e20e8e97b59c639963a5d /src/com | |
| parent | 51c44537dd9c3fef019f031cc220ca225a360ef0 (diff) | |
| parent | 56f2a7bc39a14487f01cbf2d131ba3cde4126f2d (diff) | |
| download | packages_apps_nfc-94dc4266b48f757d39ed0396bf0af86cea7c206a.zip packages_apps_nfc-94dc4266b48f757d39ed0396bf0af86cea7c206a.tar.gz packages_apps_nfc-94dc4266b48f757d39ed0396bf0af86cea7c206a.tar.bz2 | |
Merge "NFC: Enable guard host timeout." into ics-mr0
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/nfc/DeviceHost.java | 2 | ||||
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 1 | ||||
| -rwxr-xr-x | src/com/android/nfc/nxp/NativeNfcManager.java | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/nfc/DeviceHost.java b/src/com/android/nfc/DeviceHost.java index cfa0ed1..ae7fa40 100644 --- a/src/com/android/nfc/DeviceHost.java +++ b/src/com/android/nfc/DeviceHost.java @@ -196,4 +196,6 @@ public interface DeviceHost { boolean canMakeReadOnly(int technology); int getMaxTransceiveLength(int technology); + + String dump(); } diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 1b56648..b955714 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -1762,6 +1762,7 @@ public class NfcService extends Application implements DeviceHostListener { pw.println("mIsAirplaneSensitive=" + mIsAirplaneSensitive); pw.println("mIsAirplaneToggleable=" + mIsAirplaneToggleable); mP2pLinkManager.dump(fd, pw, args); + pw.println(mDeviceHost.dump()); } } } diff --git a/src/com/android/nfc/nxp/NativeNfcManager.java b/src/com/android/nfc/nxp/NativeNfcManager.java index ee75b6f..1e69970 100755 --- a/src/com/android/nfc/nxp/NativeNfcManager.java +++ b/src/com/android/nfc/nxp/NativeNfcManager.java @@ -244,6 +244,12 @@ public class NativeNfcManager implements DeviceHost { } + private native String doDump(); + @Override + public String dump() { + return doDump(); + } + /** * Notifies Ndef Message (TODO: rename into notifyTargetDiscovered) */ |