summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/keyguard
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2014-11-22 10:08:16 -0800
committerWink Saville <wink@google.com>2014-11-22 10:08:16 -0800
commitd09c4cad65c708f2c4810d24295456708a2000d2 (patch)
tree27dd308bdb4d662a149287a7cc168770a065a992 /packages/SystemUI/src/com/android/systemui/keyguard
parent85f463c5b59350fa4c4a05007f8a7b65a9a89da3 (diff)
downloadframeworks_base-d09c4cad65c708f2c4810d24295456708a2000d2.zip
frameworks_base-d09c4cad65c708f2c4810d24295456708a2000d2.tar.gz
frameworks_base-d09c4cad65c708f2c4810d24295456708a2000d2.tar.bz2
Additional changes to SubscriptionManager API as per API council.
bug: 17575308 Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 8213127..d8f8727 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -926,9 +926,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_SUB_ID;
+ IccCardConstants.State.ABSENT) != SubscriptionManager.INVALID_SUBSCRIPTION_ID;
final boolean disabled = mUpdateMonitor.getNextSubIdForState(
- IccCardConstants.State.PERM_DISABLED) != SubscriptionManager.INVALID_SUB_ID;
+ IccCardConstants.State.PERM_DISABLED)
+ != SubscriptionManager.INVALID_SUBSCRIPTION_ID;
final boolean lockedOrMissing = mUpdateMonitor.isSimPinSecure()
|| ((absent || disabled) && requireSim);