diff options
| author | Arne Coucheron <arco68@gmail.com> | 2017-02-04 22:42:18 +0100 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2017-02-04 22:46:26 +0100 |
| commit | aae108c019dfb8a950ebbe9a09128fcb72443f53 (patch) | |
| tree | bf73559a4ed975836f9f71ebaec99d060e43d9ad | |
| parent | 13267d3739544b4489648bc8590c9ae03d62d930 (diff) | |
| download | android_frameworks_opt_telephony-cm-14.1_prerebase.tar.gz android_frameworks_opt_telephony-cm-14.1_prerebase.tar.bz2 android_frameworks_opt_telephony-cm-14.1_prerebase.zip | |
Fix SIM detection when encrypted for older RILcm-14.1_prerebase
Got broken in 7.1.0_r4 merge
Change-Id: I126bd6bd4d94c51d28d4f0698f62715ed6f373db
| -rw-r--r-- | src/java/com/android/internal/telephony/uicc/UiccController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java index c7d573feb..e6f617eda 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccController.java +++ b/src/java/com/android/internal/telephony/uicc/UiccController.java @@ -129,8 +129,8 @@ public class UiccController extends Handler { // available. // Else wait for radio to be on. This is needed for the scenario when SIM is locked -- // to avoid overlap of CryptKeeper and SIM unlock screen. - if ((DECRYPT_STATE.equals(SystemProperties.get("vold.decrypt")) || - StorageManager.isFileEncryptedNativeOrEmulated() && + if (((DECRYPT_STATE.equals(SystemProperties.get("vold.decrypt")) || + StorageManager.isFileEncryptedNativeOrEmulated()) && mCis[i].getRilVersion() >= 9) || radioApmSimNotPwdn) { mCis[i].registerForAvailable(this, EVENT_ICC_STATUS_CHANGED, index); } else { |