Merge "Optimized Code: call direct method to get integer extra" am: b7fa46453a

am: 7e51242c05

Change-Id: Ide77fb0f05a8eeb2df4ab24dc1831cd734c95362
This commit is contained in:
liurong
2017-03-16 17:30:51 +00:00
committed by android-build-merger

View File

@@ -59,8 +59,7 @@ public class SimDialogActivity extends Activity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final Bundle extras = getIntent().getExtras(); final int dialogType = getIntent().getIntExtra(DIALOG_TYPE_KEY, INVALID_PICK);
final int dialogType = extras.getInt(DIALOG_TYPE_KEY, INVALID_PICK);
switch (dialogType) { switch (dialogType) {
case DATA_PICK: case DATA_PICK:
@@ -69,7 +68,7 @@ public class SimDialogActivity extends Activity {
createDialog(this, dialogType).show(); createDialog(this, dialogType).show();
break; break;
case PREFERRED_PICK: case PREFERRED_PICK:
displayPreferredDialog(extras.getInt(PREFERRED_SIM)); displayPreferredDialog(getIntent().getIntExtra(PREFERRED_SIM, 0));
break; break;
default: default:
throw new IllegalArgumentException("Invalid dialog type " + dialogType + " sent."); throw new IllegalArgumentException("Invalid dialog type " + dialogType + " sent.");