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

Commit a54bf658 authored Dec 11, 2014 by Wink Saville

Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44

parent f6ed526b

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -81,11 +81,11 @@ public class KeyguardSecurityModel {
		SecurityMode getSecurityMode() {
		KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);
		SecurityMode mode = SecurityMode.None;
		if (monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED)
		!= SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		if (SubscriptionManager.isValidSubscriptionId(
		monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {
		mode = SecurityMode.SimPin;
		} else if (monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED)
		!= SubscriptionManager.INVALID_SUBSCRIPTION_ID
		} else if (SubscriptionManager.isValidSubscriptionId(
		monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED))
		&& mLockPatternUtils.isPukUnlockScreenEnable()) {
		mode = SecurityMode.SimPuk;
		} else {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
		if (DEBUG) Log.v(TAG, "Resetting state");
		KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);
		mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED);
		if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
		int count = TelephonyManager.getDefault().getSimCount();
		Resources rez = getResources();
		final String msg;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
		state = ENTER_PUK;
		KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);
		mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED);
		if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
		int count = TelephonyManager.getDefault().getSimCount();
		Resources rez = getResources();
		final String msg;

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

+1 −1

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

		if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		if (!SubscriptionManager.isValidSubscriptionId(subId)) {
		Log.w(TAG, "invalid subId in handleSimStateChange()");
		return;
		}

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

+4 −5

Original line number	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
		final boolean requireSim = !SystemProperties.getBoolean("keyguard.no_require_sim", false);
		final boolean absent = mUpdateMonitor.getNextSubIdForState(
		IccCardConstants.State.ABSENT) != SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		final boolean disabled = mUpdateMonitor.getNextSubIdForState(
		IccCardConstants.State.PERM_DISABLED)
		!= SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		final boolean absent = SubscriptionManager.isValidSubscriptionId(
		mUpdateMonitor.getNextSubIdForState(IccCardConstants.State.ABSENT));
		final boolean disabled = SubscriptionManager.isValidSubscriptionId(
		mUpdateMonitor.getNextSubIdForState(IccCardConstants.State.PERM_DISABLED));
		final boolean lockedOrMissing = mUpdateMonitor.isSimPinSecure()
		\|\| ((absent \|\| disabled) && requireSim);