commit 673e1d98590a6cd4c2af16874fb87edd1dbffb5c
author Wink Saville <wink@google.com> Thu Dec 11 10:10:05 2014 -0800
committer The Android Automerger <android-build@google.com> Thu Dec 18 00:00:51 2014 -0800
tree 297a6fca3781ae911f58f32364ad9d55572afd44
parent d6efcbf6f8c1640e3d6502992c263c6f5f05dd09

Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44

src/com/android/settings/DataUsageSummary.java

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 @@
         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;

src/com/android/settings/deviceinfo/SimStatus.java

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 @@
             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;