OSDN Git Service

Fixed data connection toggle crash in Settings.
authorSanket Padawe <sanketpadawe@google.com>
Tue, 20 Jan 2015 18:36:15 +0000 (10:36 -0800)
committerSanket Padawe <sanketpadawe@google.com>
Tue, 20 Jan 2015 18:36:15 +0000 (10:36 -0800)
Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850

src/com/android/settings/DataUsageSummary.java

index 6de7399..8ca62fb 100644 (file)
@@ -1188,6 +1188,12 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
     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());