diff options
| author | Martijn Coenen <maco@google.com> | 2013-04-15 16:18:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 16:18:35 +0000 |
| commit | d8d8a7f0f8620b3f81f2dc33ecd5c8c093d417a0 (patch) | |
| tree | e118c13c6881b2260ee7e883ea3504e5915afc8b | |
| parent | ca588abf7222b01cf8b379abf4f2c5fc60626df6 (diff) | |
| parent | aafca6482d0b65b1ecab990659c07e4a82582db8 (diff) | |
| download | android_packages_apps_Nfc-d8d8a7f0f8620b3f81f2dc33ecd5c8c093d417a0.tar.gz android_packages_apps_Nfc-d8d8a7f0f8620b3f81f2dc33ecd5c8c093d417a0.tar.bz2 android_packages_apps_Nfc-d8d8a7f0f8620b3f81f2dc33ecd5c8c093d417a0.zip | |
Merge "Don't restart RF discovery if not needed." into jb-mr2-dev
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index bf7c7142..b1199f94 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -1258,6 +1258,12 @@ static void nfcManager_doSelectSecureElement(JNIEnv*, jobject) ALOGD ("%s: enter", __FUNCTION__); bool stat = true; + if (sIsSecElemSelected) + { + ALOGD ("%s: already selected", __FUNCTION__); + goto TheEnd; + } + PowerSwitch::getInstance ().setLevel (PowerSwitch::FULL_POWER); if (sRfEnabled) { @@ -1265,22 +1271,14 @@ static void nfcManager_doSelectSecureElement(JNIEnv*, jobject) startRfDiscovery (false); } - if (sIsSecElemSelected) - { - ALOGD ("%s: already selected", __FUNCTION__); - goto TheEnd; - } - stat = SecureElement::getInstance().activate (0xABCDEF); if (stat) SecureElement::getInstance().routeToSecureElement (); sIsSecElemSelected = true; -TheEnd: startRfDiscovery (true); - PowerSwitch::getInstance ().setModeOn (PowerSwitch::SE_ROUTING); - +TheEnd: ALOGD ("%s: exit", __FUNCTION__); } |