From 766ab606e38f4c2d589087fd5bd98ab257b6811a Mon Sep 17 00:00:00 2001
From: Sanket Padawe <sanketpadawe@google.com>
Date: Tue, 20 Jan 2015 10:36:15 -0800
Subject: [PATCH] Fixed data connection toggle crash in Settings.

Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850
---
 src/com/android/settings/DataUsageSummary.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 6de7399caae..8ca62fbc3ab 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -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());