diff options
| author | Andres Morales <anmorales@google.com> | 2014-12-03 10:07:40 -0800 |
|---|---|---|
| committer | Andres Morales <anmorales@google.com> | 2014-12-03 10:07:40 -0800 |
| commit | e6b10cf6f5c7bb363890428e2c52505c76b13b8d (patch) | |
| tree | 32a5c8b26b51e9acc81a3958ab6645db1512b429 | |
| parent | 95302c119feba7f50a5193861619346908a96164 (diff) | |
| download | android_packages_apps_Nfc-e6b10cf6f5c7bb363890428e2c52505c76b13b8d.tar.gz android_packages_apps_Nfc-e6b10cf6f5c7bb363890428e2c52505c76b13b8d.tar.bz2 android_packages_apps_Nfc-e6b10cf6f5c7bb363890428e2c52505c76b13b8d.zip | |
Fix issue where Beam is disabled in SW
If the screen is locked we don't persist the proper
state, causing NFC P2P to be disabled until SW completes,
breaking EDU provisioning.
Bug: 18534741
Change-Id: I96b8f70a7b3c58e0690c2f2fc69776e15ec41806
| -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)) |