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

Commit 6e04a7b6 authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev

parents 45838de9 a54bf658

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -81,11 +81,11 @@ public class KeyguardSecurityModel { 
    SecurityMode getSecurityMode() {

    SecurityMode getSecurityMode() {

        KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);

        KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);

        SecurityMode mode = SecurityMode.None;

        SecurityMode mode = SecurityMode.None;

        if (monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED)

        if (SubscriptionManager.isValidSubscriptionId(

                != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {

            mode = SecurityMode.SimPin;

            mode = SecurityMode.SimPin;

        } else if (monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED)

        } else if (SubscriptionManager.isValidSubscriptionId(

                != SubscriptionManager.INVALID_SUBSCRIPTION_ID

                    monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED))

                && mLockPatternUtils.isPukUnlockScreenEnable()) {

                && mLockPatternUtils.isPukUnlockScreenEnable()) {

            mode = SecurityMode.SimPuk;

            mode = SecurityMode.SimPuk;

        } else {

        } else {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
        if (DEBUG) Log.v(TAG, "Resetting state");

        if (DEBUG) Log.v(TAG, "Resetting state");

        KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);

        KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);

        mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED);

        mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED);

        if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

        if (SubscriptionManager.isValidSubscriptionId(mSubId)) {

            int count = TelephonyManager.getDefault().getSimCount();

            int count = TelephonyManager.getDefault().getSimCount();

            Resources rez = getResources();

            Resources rez = getResources();

            final String msg;

            final String msg;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { 
            state = ENTER_PUK;

            state = ENTER_PUK;

            KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);

            KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);

            mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED);

            mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED);

            if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            if (SubscriptionManager.isValidSubscriptionId(mSubId)) {

                int count = TelephonyManager.getDefault().getSimCount();

                int count = TelephonyManager.getDefault().getSimCount();

                Resources rez = getResources();

                Resources rez = getResources();

                final String msg;

                final String msg;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -938,7 +938,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                    + slotId + ", state=" + state +")");

                    + slotId + ", state=" + state +")");

        }

        }





        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            Log.w(TAG, "invalid subId in handleSimStateChange()");

            Log.w(TAG, "invalid subId in handleSimStateChange()");

            return;

            return;

        }

        }

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −5
Original line number Original line Diff line number Diff line
@@ -964,11 +964,10 @@ public class KeyguardViewMediator extends SystemUI { 




        // if the setup wizard hasn't run yet, don't show

        // if the setup wizard hasn't run yet, don't show

        final boolean requireSim = !SystemProperties.getBoolean("keyguard.no_require_sim", false);

        final boolean requireSim = !SystemProperties.getBoolean("keyguard.no_require_sim", false);

        final boolean absent = mUpdateMonitor.getNextSubIdForState(

        final boolean absent = SubscriptionManager.isValidSubscriptionId(

                IccCardConstants.State.ABSENT) != SubscriptionManager.INVALID_SUBSCRIPTION_ID;

                mUpdateMonitor.getNextSubIdForState(IccCardConstants.State.ABSENT));

        final boolean disabled = mUpdateMonitor.getNextSubIdForState(

        final boolean disabled = SubscriptionManager.isValidSubscriptionId(

                IccCardConstants.State.PERM_DISABLED)

                mUpdateMonitor.getNextSubIdForState(IccCardConstants.State.PERM_DISABLED));

                != SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        final boolean lockedOrMissing = mUpdateMonitor.isSimPinSecure()

        final boolean lockedOrMissing = mUpdateMonitor.isSimPinSecure()

                || ((absent || disabled) && requireSim);

                || ((absent || disabled) && requireSim);