Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge: 5f1eb2d

automerge: 49c85c4

* commit '49c85c4356ccfcb622e501b57d2893fc7e40bce0':
  Fixed data connection toggle crash in Settings.

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());