diff options
| author | Christopher Tate <ctate@google.com> | 2014-02-12 21:18:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-12 21:18:49 +0000 |
| commit | c65d26ee0e3792fc17c156c48e62b24f242e0c8d (patch) | |
| tree | f133838f2b21808525373de4ac01ade9da02f51b /core/java | |
| parent | 09591e89e4cf6d3ea836b02e3ef965375f4ab214 (diff) | |
| parent | 9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a (diff) | |
| download | frameworks_base-c65d26ee0e3792fc17c156c48e62b24f242e0c8d.zip frameworks_base-c65d26ee0e3792fc17c156c48e62b24f242e0c8d.tar.gz frameworks_base-c65d26ee0e3792fc17c156c48e62b24f242e0c8d.tar.bz2 | |
Merge "Always call super.onCreate(). Always."
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]; |