summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2013-03-18 14:51:28 -0700
committerThe Android Automerger <android-build@android.com>2013-03-18 18:28:34 -0700
commit843b1398a34f271baec039b73a6bdf02a2ce5933 (patch)
treeb5146323651d028a3e66d7fc4288132c71855e5b
parentda28b3192e9d3ba99ba407c4b5f9286829aa209e (diff)
downloadandroid_packages_apps_Nfc-843b1398a34f271baec039b73a6bdf02a2ce5933.tar.gz
android_packages_apps_Nfc-843b1398a34f271baec039b73a6bdf02a2ce5933.tar.bz2
android_packages_apps_Nfc-843b1398a34f271baec039b73a6bdf02a2ce5933.zip
Don't dynamically enable/disable UICC timeout.
Temporary disable this until we figure out what's going on in Manta. Change-Id: I2cf54bd7c7d3da1a7f309a936b982bf8e7109673
-rwxr-xr-xnci/jni/SecureElement.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/nci/jni/SecureElement.cpp b/nci/jni/SecureElement.cpp
index 3e65467b..1c5a6de6 100755
--- a/nci/jni/SecureElement.cpp
+++ b/nci/jni/SecureElement.cpp
@@ -686,9 +686,6 @@ bool SecureElement::connectEE ()
// Disable RF discovery completely while the DH is connected
android::startRfDiscovery(false);
- // Disable UICC idle timeout while the DH is connected
- android::setUiccIdleTimeout (false);
-
mNewSourceGate = 0;
if (gGatePipe == -1)
@@ -872,9 +869,6 @@ bool SecureElement::disconnectEE (jint seID)
mIsPiping = false;
- // Re-enable UICC low-power mode
- android::setUiccIdleTimeout (true);
-
// Re-enable RF discovery
// Note that it only effactuates the current configuration,
// so if polling/listening were configured OFF (forex because