PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sanket Padawe
2014-12-23 03:35:22 +00:00
committed by Android (Google) Code Review
parent e957cb47a4 79d5da7bf6
commit 9b1383a46d
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/sim/SimDialogActivity.java
View File

@@ -87,23 +87,27 @@ public class SimDialogActivity extends Activity {
final Context context = getApplicationContext(); final Context context = getApplicationContext();
final SubscriptionInfo sir = Utils.findRecordBySlotId(context, slotId); final SubscriptionInfo sir = Utils.findRecordBySlotId(context, slotId);
if (sir != null) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this); AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
alertDialogBuilder.setTitle(R.string.sim_preferred_title); alertDialogBuilder.setTitle(R.string.sim_preferred_title);
alertDialogBuilder.setMessage(res.getString( alertDialogBuilder.setMessage(res.getString(
R.string.sim_preferred_message, sir.getDisplayName())); R.string.sim_preferred_message, sir.getDisplayName()));
alertDialogBuilder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { alertDialogBuilder.setPositiveButton(R.string.yes, new
DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
final int subId = sir.getSubscriptionId(); final int subId = sir.getSubscriptionId();
PhoneAccountHandle phoneAccountHandle = subscriptionIdToPhoneAccountHandle(subId); PhoneAccountHandle phoneAccountHandle =
subscriptionIdToPhoneAccountHandle(subId);
setDefaultDataSubId(context, subId); setDefaultDataSubId(context, subId);
setDefaultSmsSubId(context, subId); setDefaultSmsSubId(context, subId);
setUserSelectedOutgoingPhoneAccount(phoneAccountHandle); setUserSelectedOutgoingPhoneAccount(phoneAccountHandle);
finish(); finish();
} }
}); });
alertDialogBuilder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { alertDialogBuilder.setNegativeButton(R.string.no, new
DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog,int id) { public void onClick(DialogInterface dialog,int id) {
finish(); finish();
@@ -111,6 +115,9 @@ public class SimDialogActivity extends Activity {
}); });
alertDialogBuilder.create().show(); alertDialogBuilder.create().show();
} else {
finish();
}
} }
private static void setDefaultDataSubId(final Context context, final int subId) { private static void setDefaultDataSubId(final Context context, final int subId) {