commit b1bfa206548d4242f3e3970bf1b0e9c2ad92f128
author Wink Saville <wink@google.com> Thu Dec 11 10:10:36 2014 -0800
committer The Android Automerger <android-build@google.com> Thu Dec 18 00:00:52 2014 -0800
tree 70aff5bca8f8457049314313ffe58d9b3062b117
parent 8652cdf1d1fbe0f91b4d3b0ae1675c39bd1cd303

Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44

src/com/android/mms/service/MmsService.java

diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index 0246583..09a86a9 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -155,7 +155,7 @@
     }
 
     private int checkSubId(int subId) {
-        if (!SubscriptionManager.isValidSubId(subId)) {
+        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
             throw new RuntimeException("Invalid subId " + subId);
         }
         if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
@@ -433,8 +433,8 @@
         while (mPendingSimRequestQueue.size() > 0) {
             final MmsRequest request = mPendingSimRequestQueue.peek();
             if (request != null) {
-                if (mCurrentSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID ||
-                        mCurrentSubId == request.getSubId()) {
+                if (!SubscriptionManager.isValidSubscriptionId(mCurrentSubId)
+                        || mCurrentSubId == request.getSubId()) {
                     // First or subsequent requests with same SIM ID
                     mPendingSimRequestQueue.remove();
                     addToRunningRequestQueueSynchronized(request);