diff options
| author | Kenny Root <kroot@google.com> | 2011-07-15 14:03:46 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2011-07-15 14:08:18 -0700 |
| commit | 03960d20997b8354f328b4acfbd9474141137dfe (patch) | |
| tree | ca99f4dedf6f4a5dcb07bb5fd3445f8691085e70 /jni | |
| parent | ea9898eb8041802bca345b59de9e0e9302e8232b (diff) | |
| parent | 399a21b88d408759757cccf88a1c4af140fb71f0 (diff) | |
| download | packages_apps_nfc-03960d20997b8354f328b4acfbd9474141137dfe.tar.gz packages_apps_nfc-03960d20997b8354f328b4acfbd9474141137dfe.tar.bz2 packages_apps_nfc-03960d20997b8354f328b4acfbd9474141137dfe.zip | |
resolved conflicts for merge of 399a21b8 to master
Change-Id: Ia3f4e08598504039eca70aa95e7ddd590e903881
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/com_android_nfc_NativeNfcManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp index d67fefc..904d3fa 100644 --- a/jni/com_android_nfc_NativeNfcManager.cpp +++ b/jni/com_android_nfc_NativeNfcManager.cpp @@ -1472,7 +1472,7 @@ static void nfc_jni_stop_discovery_locked(struct nfc_jni_native_data *nat) } discovery_cfg.PollDevInfo.PollEnabled = 0; - discovery_cfg.Duration = 0xffffffff; + discovery_cfg.Duration = 300000; /* in ms */ discovery_cfg.NfcIP_Mode = phNfc_eDefaultP2PMode; discovery_cfg.NfcIP_Tgt_Disable = TRUE; |