summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Chu <evanchu@broadcom.com>2012-08-23 22:46:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-23 22:46:58 -0700
commitb7a8d9cecfc673601efc4daebb8fe3cd6a66238a (patch)
tree69e37198e2e39fa6a764362657a0cd6e738eca89
parent22b1a3096cdb66ba2fbc540e1a8cacce701c6d82 (diff)
parent59ff0d6e6f4de4703a4489144a4311405eeead5a (diff)
downloadpackages_apps_nfc-b7a8d9cecfc673601efc4daebb8fe3cd6a66238a.zip
packages_apps_nfc-b7a8d9cecfc673601efc4daebb8fe3cd6a66238a.tar.gz
packages_apps_nfc-b7a8d9cecfc673601efc4daebb8fe3cd6a66238a.tar.bz2
am 59ff0d6e: During nfcManager_disableDiscovery() go to power-off-sleep mode.
* commit '59ff0d6e6f4de4703a4489144a4311405eeead5a': During nfcManager_disableDiscovery() go to power-off-sleep mode.
-rwxr-xr-xnci/jni/NativeNfcManager.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 40b9539..9adeed3 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -838,6 +838,8 @@ void nfcManager_disableDiscovery (JNIEnv* e, jobject o)
if (sDiscoveryEnabled == false)
{
ALOGD ("%s: already disabled", __FUNCTION__);
+ if (! sIsSecElemSelected)
+ PowerSwitch::getInstance ().setLevel (PowerSwitch::LOW_POWER);
goto TheEnd;
}