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

Commit 2c364790 authored by kaiyiz's avatar kaiyiz Committed by Steve Kondik
Browse files

SystemUI: Fix sim pin lock message displaying incorrectly issue 

When verify password successfully and no sim card is pin locked,
getSimPinLockSubId returning invalid sub id causes slot name
displays incorrectly.

Do not update sub info if sub id is invalid, remove inappropriate
security message update to avoid displaying incorrectly.

CRs-Fixed: 737973

Change-Id: Ic4c4aca09456008c72677aedd9caa6af9e84da8f
parent 5e0f5527

packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java

+1 −3
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 


    private void handleSubInfoChangeIfNeeded() {

        long subId = mKgUpdateMonitor.getSimPinLockSubId();

        if (subId != mSubId) {

        if (SubscriptionManager.isValidSubId(subId) && (subId != mSubId)) {

            mSubId = subId;

            handleSubInfoChange();

        }
@@ -388,8 +388,6 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
            mSecurityMessageDisplay.setMessage(getPinPasswordErrorMessage(

                    mRemainingAttempts, true), true);

            return;

        } else {

            mSecurityMessageDisplay.setMessage(R.string.kg_sim_pin_instructions, true);

        }

    }

}