commit ae3c5a4bca67c92c8d22a7c840e460fa7a17a7da
author Martijn Coenen <maco@google.com> Wed Mar 27 23:34:22 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 27 23:34:23 2013 +0000
tree 7cd776db22a995d5a80364a28c3898a7bb44b6b8
parent 2b4fe5f5fe3da819d21b2c0c3df09a370854c47b
parent 2ea2330fab198389a8a1fc9572b9a5d40581596c

Merge "Re-enable dynamic UICC idle timeout switching." into jb-mr2-dev

nci/jni/SecureElement.cpp

diff --git a/nci/jni/SecureElement.cpp b/nci/jni/SecureElement.cpp
index 1c5a6de..0448b60 100755
--- a/nci/jni/SecureElement.cpp
+++ b/nci/jni/SecureElement.cpp
@@ -686,6 +686,9 @@
     // 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)
@@ -869,11 +872,14 @@
 
     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
     // the screen was off), they will stay OFF with this call.
     android::startRfDiscovery(true);
+
     return true;
 }