commit 9b1383a46dadd60ed89561083b01666242d457dd
author Sanket Padawe <sanketpadawe@google.com> Tue Dec 23 03:35:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 23 03:35:23 2014 +0000
tree e5b2126da4a839980618b70da3222dd94df44dc2
parent e957cb47a4d2bca7f5d3e8e925efae6269754cb3
parent 79d5da7bf6d0f64ef27a16c6c03a3b2dd622e92f

Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev

src/com/android/settings/sim/SimDialogActivity.java

diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 019b5c0..0964f10 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -87,30 +87,37 @@
         final Context context = getApplicationContext();
         final SubscriptionInfo sir = Utils.findRecordBySlotId(context, slotId);
 
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
-        alertDialogBuilder.setTitle(R.string.sim_preferred_title);
-        alertDialogBuilder.setMessage(res.getString(
-                    R.string.sim_preferred_message, sir.getDisplayName()));
+        if (sir != null) {
+            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+            alertDialogBuilder.setTitle(R.string.sim_preferred_title);
+            alertDialogBuilder.setMessage(res.getString(
+                        R.string.sim_preferred_message, sir.getDisplayName()));
 
-        alertDialogBuilder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int id) {
-                final int subId = sir.getSubscriptionId();
-                PhoneAccountHandle phoneAccountHandle = subscriptionIdToPhoneAccountHandle(subId);
-                setDefaultDataSubId(context, subId);
-                setDefaultSmsSubId(context, subId);
-                setUserSelectedOutgoingPhoneAccount(phoneAccountHandle);
-                finish();
-            }
-        });
-        alertDialogBuilder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog,int id) {
-                finish();
-            }
-        });
+            alertDialogBuilder.setPositiveButton(R.string.yes, new
+                    DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int id) {
+                    final int subId = sir.getSubscriptionId();
+                    PhoneAccountHandle phoneAccountHandle =
+                            subscriptionIdToPhoneAccountHandle(subId);
+                    setDefaultDataSubId(context, subId);
+                    setDefaultSmsSubId(context, subId);
+                    setUserSelectedOutgoingPhoneAccount(phoneAccountHandle);
+                    finish();
+                }
+            });
+            alertDialogBuilder.setNegativeButton(R.string.no, new
+                    DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog,int id) {
+                    finish();
+                }
+            });
 
-        alertDialogBuilder.create().show();
+            alertDialogBuilder.create().show();
+        } else {
+            finish();
+        }
     }
 
     private static void setDefaultDataSubId(final Context context, final int subId) {