Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev (9b1383a4) · Commits · e / os / android_packages_apps_Settings

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

+30 −23

Original line number	Diff line number	Diff line
		@@ -87,23 +87,27 @@ public class SimDialogActivity extends Activity {
		final Context context = getApplicationContext();
		final SubscriptionInfo sir = Utils.findRecordBySlotId(context, slotId);

		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() {
		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);
		PhoneAccountHandle phoneAccountHandle =
		subscriptionIdToPhoneAccountHandle(subId);
		setDefaultDataSubId(context, subId);
		setDefaultSmsSubId(context, subId);
		setUserSelectedOutgoingPhoneAccount(phoneAccountHandle);
		finish();
		}
		});
		alertDialogBuilder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
		alertDialogBuilder.setNegativeButton(R.string.no, new
		DialogInterface.OnClickListener() {
		@Override
		public void onClick(DialogInterface dialog,int id) {
		finish();
		@@ -111,6 +115,9 @@ public class SimDialogActivity extends Activity {
		});

		alertDialogBuilder.create().show();
		} else {
		finish();
		}
		}

		private static void setDefaultDataSubId(final Context context, final int subId) {