Merge "Include always ask button in SIM picker dialog" into qt-dev

am: d414c64dc3

Change-Id: I121e662ca5dad110ac53caa55cb8b72501e2bf4a
This commit is contained in:
Fan Zhang
2019-04-30 00:04:22 -07:00
committed by android-build-merger

View File

@@ -83,11 +83,12 @@ public class SimDialogActivity extends FragmentActivity {
return SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_data,
false /* includeAskEveryTime */);
case CALLS_PICK:
return CallsSimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_calls,
return CallsSimListDialogFragment.newInstance(dialogType,
R.string.select_sim_for_calls,
true /* includeAskEveryTime */);
case SMS_PICK:
return SimListDialogFragment.newInstance(dialogType, R.string.select_sim_for_sms,
false /* includeAskEveryTime */);
true /* includeAskEveryTime */);
case PREFERRED_PICK:
if (!getIntent().hasExtra(PREFERRED_SIM)) {
throw new IllegalArgumentException("Missing required extra " + PREFERRED_SIM);