diff options
| author | Martijn Coenen <maco@google.com> | 2015-07-29 14:37:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 14:37:48 +0000 |
| commit | 363a666afd3175904d5bc8b4e73d2751ca7af176 (patch) | |
| tree | a1eb9c44c9c0f3dd1934650c465928e3e564a38a | |
| parent | d02b61c3e222f196bf149adb7497687bfc262088 (diff) | |
| parent | c336a8c4fc880909475be1870fb9281f1dd00ab0 (diff) | |
| download | android_packages_apps_Nfc-363a666afd3175904d5bc8b4e73d2751ca7af176.tar.gz android_packages_apps_Nfc-363a666afd3175904d5bc8b4e73d2751ca7af176.tar.bz2 android_packages_apps_Nfc-363a666afd3175904d5bc8b4e73d2751ca7af176.zip | |
am c336a8c4: Merge "Reset P2P flag in de-initialization." into mnc-dr-dev
* commit 'c336a8c4fc880909475be1870fb9281f1dd00ab0':
Reset P2P flag in de-initialization.
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 36e89c00..e08b42cc 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -1244,6 +1244,7 @@ static jboolean nfcManager_doDeinitialize (JNIEnv*, jobject) sDiscoveryEnabled = false; sPollingEnabled = false; sIsDisabling = false; + sP2pEnabled = false; gActivated = false; { |