diff options
| author | Wink Saville <wink@google.com> | 2014-12-12 04:22:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-12 04:22:40 +0000 |
| commit | 6e04a7b65488656c4cb72d99d285050d56068112 (patch) | |
| tree | 9bb8d88310e45f61db86713405c99dc11b0f1252 /services | |
| parent | 45838de942b87150fc3b03a8b943841a8647fd81 (diff) | |
| parent | a54bf6583380cf328b9858d942b4c387c6163f0f (diff) | |
| download | frameworks_base-6e04a7b65488656c4cb72d99d285050d56068112.zip frameworks_base-6e04a7b65488656c4cb72d99d285050d56068112.tar.gz frameworks_base-6e04a7b65488656c4cb72d99d285050d56068112.tar.bz2 | |
Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 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; |