From d72c062fa81cba7fcd70456c8cc2e6fab8fe6997 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Thu, 11 Dec 2014 10:10:05 -0800
Subject: [PATCH] Change tests against INVALID_SUBSCRIPTION_ID to use
 isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
---
 src/com/android/settings/DataUsageSummary.java     | 2 +-
 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 7e9e8ff5f8c..732d4c87e7b 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 2d1da40a3f8..6c52412116c 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;