diff options
| author | Wink Saville <wink@google.com> | 2014-12-11 10:10:05 -0800 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2014-12-11 10:10:05 -0800 |
| commit | d72c062fa81cba7fcd70456c8cc2e6fab8fe6997 (patch) | |
| tree | 7b72bae5d82810ea4f1ed956de22ad21eb41ce5c | |
| parent | 25a1181f2a61d32481e7c66f96c2abf7aebd761e (diff) | |
| download | packages_apps_Settings-d72c062fa81cba7fcd70456c8cc2e6fab8fe6997.zip packages_apps_Settings-d72c062fa81cba7fcd70456c8cc2e6fab8fe6997.tar.gz packages_apps_Settings-d72c062fa81cba7fcd70456c8cc2e6fab8fe6997.tar.bz2 | |
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
| -rw-r--r-- | src/com/android/settings/DataUsageSummary.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/deviceinfo/SimStatus.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index 7e9e8ff..732d4c8 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -2285,7 +2285,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable if (template == null) { final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY, SubscriptionManager.INVALID_SUBSCRIPTION_ID); - if (SubscriptionManager.isValidSubId(subId)) { + if (SubscriptionManager.isValidSubscriptionId(subId)) { return TAB_MOBILE + String.valueOf(subId); } return null; diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java index 2d1da40..6c52412 100644 --- a/src/com/android/settings/deviceinfo/SimStatus.java +++ b/src/com/android/settings/deviceinfo/SimStatus.java @@ -365,7 +365,7 @@ public class SimStatus extends PreferenceActivity { final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId( mSir.getSubscriptionId())); if (UserHandle.myUserId() == UserHandle.USER_OWNER - && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { + && SubscriptionManager.isValidSubscriptionId(mSir.getSubscriptionId())) { if (phone == null) { Log.e(TAG, "Unable to locate a phone object for the given Subscription ID."); return; |