Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c31cf848 authored by Arne Coucheron's avatar Arne Coucheron
Browse files

telephony: Fix rebase mismerge breaking SIM detection when encrypted 

Change-Id: I7b8b878f42ae949592551430a90115a7b93af545
parent 4a9f49f7

src/java/com/android/internal/telephony/uicc/UiccController.java

+3 −4
Original line number Diff line number Diff line
@@ -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);