diff options
| -rw-r--r-- | src/java/com/android/internal/telephony/uicc/UiccController.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java index 2afd5a80f..a50aaea99 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccController.java +++ b/src/java/com/android/internal/telephony/uicc/UiccController.java @@ -129,10 +129,9 @@ 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() || radioApmSimNotPwdn) { - // Reading ICC status in airplane mode is only supported in QCOM - // RILs when this property is set to true + 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 { mCis[i].registerForOn(this, EVENT_ICC_STATUS_CHANGED, index); |