diff options
| author | Christopher Tate <ctate@google.com> | 2014-02-12 13:14:10 -0800 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2014-02-12 13:15:46 -0800 |
| commit | 9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a (patch) | |
| tree | 99fdb3ac1f647e42cf0c5ef85bf90267766f1663 /core/java | |
| parent | 1717eb1dc16402627d3361f8bb78493ba0beb9f0 (diff) | |
| download | frameworks_base-9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a.zip frameworks_base-9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a.tar.gz frameworks_base-9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a.tar.bz2 | |
Always call super.onCreate(). Always.
Bug 12991134
Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
Diffstat (limited to 'core/java')
| -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]; |
