Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always call super.onCreate(). Always."

Browse Source
This commit is contained in:
Christopher Tate
2014-02-12 21:18:48 +00:00
committed by Android (Google) Code Review
parent 09591e89e4 9d6376a1d8
commit c65d26ee0e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/ChooserActivity.java
View File

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