diff options
| author | Andres Morales <anmorales@google.com> | 2014-12-04 21:47:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 21:47:08 +0000 |
| commit | a86af75e56ffd26cef26cfc8aa1898a718b42ea2 (patch) | |
| tree | 91e2307c942e4a37de2201f00b3f52750ccc6d05 /nci | |
| parent | 2c760cacddb0f47f10b182a8f8951bf93ed74213 (diff) | |
| parent | 91cf82451434dd12713e23dfdaf49bc67dec114f (diff) | |
| download | android_packages_apps_Nfc-a86af75e56ffd26cef26cfc8aa1898a718b42ea2.tar.gz android_packages_apps_Nfc-a86af75e56ffd26cef26cfc8aa1898a718b42ea2.tar.bz2 android_packages_apps_Nfc-a86af75e56ffd26cef26cfc8aa1898a718b42ea2.zip | |
am 91cf8245: am e6b10cf6: Fix issue where Beam is disabled in SW
* commit '91cf82451434dd12713e23dfdaf49bc67dec114f':
Fix issue where Beam is disabled in SW
Diffstat (limited to 'nci')
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 98e243a1..36e89c00 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -1052,7 +1052,7 @@ void nfcManager_disableDiscovery (JNIEnv* e, jobject o) status = stopPolling_rfDiscoveryDisabled(); PeerToPeer::getInstance().enableP2pListening (false); - + sP2pEnabled = false; sDiscoveryEnabled = false; //if nothing is active after this, then tell the controller to power down if (! PowerSwitch::getInstance ().setModeOff (PowerSwitch::DISCOVERY)) |