commit a54bf6583380cf328b9858d942b4c387c6163f0f
author Wink Saville <wink@google.com> Thu Dec 11 13:37:50 2014 -0800
committer Wink Saville <wink@google.com> Thu Dec 11 13:37:50 2014 -0800
tree 9306aa8c96d54bcd490ed444d4928549146f4e59
parent f6ed526b3a02bac9c5912a9655e5890f332cefc6

Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44

services/core/java/com/android/server/TelephonyRegistry.java

diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 34da901..776f836 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -480,7 +480,7 @@
                 r.callerUid = callerUid;
                 // Legacy applications pass SubscriptionManager.DEFAULT_SUB_ID,
                 // force all illegal subId to SubscriptionManager.DEFAULT_SUB_ID
-                if (!SubscriptionManager.isValidSubId(subId)) {
+                if (!SubscriptionManager.isValidSubscriptionId(subId)) {
                     r.subId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;
                  } else {//APP specify subID
                     r.subId = subId;