commit 766ab606e38f4c2d589087fd5bd98ab257b6811a
author Sanket Padawe <sanketpadawe@google.com> Tue Jan 20 10:36:15 2015 -0800
committer Sanket Padawe <sanketpadawe@google.com> Tue Jan 20 10:36:15 2015 -0800
tree 0708a6470f7d98f2e0b8fe374a8c6943bd0f389c
parent 906fc4172466e7ddd0886fa51b308ce4e69c266a

Fixed data connection toggle crash in Settings.

Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850

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