commit 5f1eb2d72a1a7dfb42398176c24445a906cd380c
author Sanket Padawe <sanketpadawe@google.com> Wed Jan 21 17:08:45 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 21 17:08:45 2015 +0000
tree 2456227b7581bb8bf8f58438f8fefdc41e4781b1
parent 75c5298e06eb54dbc96ccc17696ba8e1c8316ee7
parent 766ab606e38f4c2d589087fd5bd98ab257b6811a

Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev

src/com/android/settings/DataUsageSummary.java

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 6de7399..8ca62fb 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -1188,6 +1188,12 @@
     private void handleMultiSimDataDialog() {
         final Context context = getActivity();
         final SubscriptionInfo currentSir = getCurrentTabSubInfo(context);
+
+        //If sim has not loaded after toggling data switch, return.
+        if (currentSir == null) {
+            return;
+        }
+
         final SubscriptionInfo nextSir = mSubscriptionManager.getActiveSubscriptionInfo(
                 mSubscriptionManager.getDefaultDataSubId());