commit 53d4a3dc29d1a0f2cf384cb0bfc982c1ce622e0a
author Amit Mahajan <amitmahajan@google.com> Wed Jan 07 18:11:16 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 07 18:11:16 2015 +0000
tree bf899069dcbf96ec03d36b787aa775703b3b5593
parent 9443cdcbda67d657773398a262022a04f3e27841
parent a6fc2a8518c71b7a720f849bbfd4c51fe35a461d

Merge "Fix to use subId instead of slotId when calling getPhone()" into lmp-mr1-dev

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index e6b066b..b60c963 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -125,6 +125,7 @@
     private MyHandler mHandler;
     private boolean mOkClicked;
 
+    // We assume the the value returned by mTabHost.getCurrentTab() == slotId
     private TabHost mTabHost;
 
     //GsmUmts options and Cdma options
@@ -333,7 +334,7 @@
             }
             case DO_NOTHING: {
                 if (DBG) log("initializeSubscriptions: DO_NOTHING");
-                currentTab = 0;
+                currentTab = mTabHost != null ? mTabHost.getCurrentTab() : 0;
                 break;
             }
         }