commit 21e78ace4e0366ad2bc7f39406b7fa8dff2bd407
author Santos Cordon <santoscordon@google.com> Fri Feb 06 05:19:29 2015 -0800
committer Etan Cohen <etancohen@google.com> Mon Mar 02 10:27:45 2015 -0800
tree bc38ef80a0b164934e2b1fe97a7b2e8bb7c7b800
parent 4592755c194e8691d0cafd717a258860dc05cca8

Consolidate subscription ID acquisition.

Update TelephonyConnectionService to use
PhoneUtil.getSubIdForPhoneAccount instead of duplicating the code.

Change-Id: I7fbbc406a45ccea0e7a544d311878697562273b8

src/com/android/phone/PhoneUtils.java

diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 761d11b..7da2e1f 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -2462,14 +2462,18 @@
     }
 
     public static int getSubIdForPhoneAccount(PhoneAccount phoneAccount) {
-        if (phoneAccount != null) {
-            PhoneAccountHandle handle = phoneAccount.getAccountHandle();
-            if (handle != null && handle.getComponentName().equals(getPstnConnectionServiceName()) &&
-                    phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
-                String id = handle.getId();
-                if (TextUtils.isDigitsOnly(id)) {
-                    return Integer.parseInt(id);
-                }
+        if (phoneAccount != null
+                && phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+            return getSubIdForPhoneAccountHandle(phoneAccount.getAccountHandle());
+        }
+        return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+    }
+
+    public static int getSubIdForPhoneAccountHandle(PhoneAccountHandle handle) {
+        if (handle != null && handle.getComponentName().equals(getPstnConnectionServiceName())) {
+            String id = handle.getId();
+            if (TextUtils.isDigitsOnly(id)) {
+                return Integer.parseInt(id);
             }
         }
         return SubscriptionManager.INVALID_SUBSCRIPTION_ID;