Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ed27328 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

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

* commit 'dc97144b':
  Always call super.onCreate().  Always.
parents 24a2f20f dc97144b

core/java/com/android/internal/app/ChooserActivity.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,9 @@ public class ChooserActivity extends ResolverActivity { 
        Intent intent = getIntent();

        Intent intent = getIntent();

        Parcelable targetParcelable = intent.getParcelableExtra(Intent.EXTRA_INTENT);

        Parcelable targetParcelable = intent.getParcelableExtra(Intent.EXTRA_INTENT);

        if (!(targetParcelable instanceof Intent)) {

        if (!(targetParcelable instanceof Intent)) {

            Log.w("ChooseActivity", "Target is not an intent: " + targetParcelable);

            Log.w("ChooserActivity", "Target is not an intent: " + targetParcelable);

            finish();

            finish();

            super.onCreate(null);

            return;

            return;

        }

        }

        Intent target = (Intent)targetParcelable;

        Intent target = (Intent)targetParcelable;
@@ -42,9 +43,10 @@ public class ChooserActivity extends ResolverActivity { 
            initialIntents = new Intent[pa.length];

            initialIntents = new Intent[pa.length];

            for (int i=0; i<pa.length; i++) {

            for (int i=0; i<pa.length; i++) {

                if (!(pa[i] instanceof Intent)) {

                if (!(pa[i] instanceof Intent)) {

                    Log.w("ChooseActivity", "Initial intent #" + i

                    Log.w("ChooserActivity", "Initial intent #" + i

                            + " not an Intent: " + pa[i]);

                            + " not an Intent: " + pa[i]);

                    finish();

                    finish();

                    super.onCreate(null);

                    return;

                    return;

                }

                }

                initialIntents[i] = (Intent)pa[i];

                initialIntents[i] = (Intent)pa[i];