Merge "Always call super.onCreate(). Always." (c65d26ee) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -27,8 +27,9 @@ public class ChooserActivity extends ResolverActivity {
		Intent intent = getIntent();
		Parcelable targetParcelable = intent.getParcelableExtra(Intent.EXTRA_INTENT);
		if (!(targetParcelable instanceof Intent)) {
		Log.w("ChooseActivity", "Target is not an intent: " + targetParcelable);
		Log.w("ChooserActivity", "Target is not an intent: " + targetParcelable);
		finish();
		super.onCreate(null);
		return;
		}
		Intent target = (Intent)targetParcelable;
		@@ -42,9 +43,10 @@ public class ChooserActivity extends ResolverActivity {
		initialIntents = new Intent[pa.length];
		for (int i=0; i<pa.length; i++) {
		if (!(pa[i] instanceof Intent)) {
		Log.w("ChooseActivity", "Initial intent #" + i
		Log.w("ChooserActivity", "Initial intent #" + i
		+ " not an Intent: " + pa[i]);
		finish();
		super.onCreate(null);
		return;
		}
		initialIntents[i] = (Intent)pa[i];