diff options
author | Nick Kralevich <nnk@google.com> | 2014-04-04 23:25:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 23:25:52 +0000 |
commit | 4ed27328b5e20d32b1e6ac5b39684dad3e737ca7 (patch) | |
tree | 2409919afdb9f2673324ed0b2c7ab25b6be0ebac | |
parent | 24a2f20fe64e893e28dc70b288e12567ff71019f (diff) | |
parent | dc97144b3f83bf6dae90493a6631afc6523dfce2 (diff) | |
download | frameworks_base-4ed27328b5e20d32b1e6ac5b39684dad3e737ca7.zip frameworks_base-4ed27328b5e20d32b1e6ac5b39684dad3e737ca7.tar.gz frameworks_base-4ed27328b5e20d32b1e6ac5b39684dad3e737ca7.tar.bz2 |
am dc97144b: Merge "Always call super.onCreate(). Always."
* commit 'dc97144b3f83bf6dae90493a6631afc6523dfce2':
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 70f90d3..1eda373 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]; |