diff options
| author | Wink Saville <wink@google.com> | 2014-12-11 13:37:50 -0800 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2014-12-11 13:37:50 -0800 |
| commit | a54bf6583380cf328b9858d942b4c387c6163f0f (patch) | |
| tree | 9306aa8c96d54bcd490ed444d4928549146f4e59 /packages/SystemUI/src/com/android/systemui/keyguard | |
| parent | f6ed526b3a02bac9c5912a9655e5890f332cefc6 (diff) | |
| download | frameworks_base-a54bf6583380cf328b9858d942b4c387c6163f0f.zip frameworks_base-a54bf6583380cf328b9858d942b4c387c6163f0f.tar.gz frameworks_base-a54bf6583380cf328b9858d942b4c387c6163f0f.tar.bz2 | |
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Rename isValidSubId to isValidSubscriptionId.
Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 7ac0daf..e66934e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -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); |