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

am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always."

Browse Source 
* commit '4ed27328b5e20d32b1e6ac5b39684dad3e737ca7':
  Always call super.onCreate().  Always.
This commit is contained in:
Nick Kralevich
2014-04-04 23:31:44 +00:00
committed by Android Git Automerger
parent de4fedefbf 4ed27328b5
commit 8e2a4b5395
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();
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];