diff options
author | Nick Kralevich <nnk@google.com> | 2014-04-04 23:18:45 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-04 23:18:46 +0000 |
commit | dc97144b3f83bf6dae90493a6631afc6523dfce2 (patch) | |
tree | fe99b91cd1c5cd0ae5dfe294bd184a61ca35f247 | |
parent | c420ce34ba177cd959cbb9432e9597d377e6cee6 (diff) | |
parent | 5eab368c4d089b23c45d31b99e4bef64003c9cfb (diff) | |
download | base-dc97144b3f83bf6dae90493a6631afc6523dfce2.tar.gz |
Merge "Always call super.onCreate(). Always."
-rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 70f90d345fd0..1eda373477bb 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -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]; |