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

Commit 67f3a40c authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am bf78fc2a: am 89e68d78: Merge "Create main activity intents as needed for... 

am bf78fc2a: am 89e68d78: Merge "Create main activity intents as needed for TaskStackBuilder/Up nav" into jb-mr1-dev

* commit 'bf78fc2a':
  Create main activity intents as needed for TaskStackBuilder/Up nav
parents a8aead0a bf78fc2a

core/java/android/app/Activity.java

+15 −1
Original line number Diff line number Diff line
@@ -5010,7 +5010,21 @@ public class Activity extends ContextThemeWrapper 
        if (TextUtils.isEmpty(parentName)) {

            return null;

        }

        return new Intent().setClassName(this, parentName);



        // If the parent itself has no parent, generate a main activity intent.

        final ComponentName target = new ComponentName(this, parentName);

        try {

            final ActivityInfo parentInfo = getPackageManager().getActivityInfo(target, 0);

            final String parentActivity = parentInfo.parentActivityName;

            final Intent parentIntent = parentActivity == null

                    ? Intent.makeMainActivity(target)

                    : new Intent().setComponent(target);

            return parentIntent;

        } catch (NameNotFoundException e) {

            Log.e(TAG, "getParentActivityIntent: bad parentActivityName '" + parentName +

                    "' in manifest");

            return null;

        }

    }



    // ------------------ Internal API ------------------

core/java/android/app/TaskStackBuilder.java

+13 −40
Original line number Diff line number Diff line
@@ -124,24 +124,12 @@ public class TaskStackBuilder { 
     * @return This TaskStackBuilder for method chaining

     */

    public TaskStackBuilder addParentStack(Activity sourceActivity) {

        final int insertAt = mIntents.size();

        Intent parent = sourceActivity.getParentActivityIntent();

        PackageManager pm = sourceActivity.getPackageManager();

        while (parent != null) {

            mIntents.add(insertAt, parent);

            try {

                ActivityInfo info = pm.getActivityInfo(parent.getComponent(), 0);

                String parentActivity = info.parentActivityName;

                if (parentActivity != null) {

                    parent = new Intent().setComponent(

                            new ComponentName(mSourceContext, parentActivity));

                } else {

                    parent = null;

                }

            } catch (NameNotFoundException e) {

                Log.e(TAG, "Bad ComponentName while traversing activity parent metadata");

                throw new IllegalArgumentException(e);

            }

        final Intent parent = sourceActivity.getParentActivityIntent();

        if (parent != null) {

            // We have the actual parent intent, build the rest from static metadata

            // then add the direct parent intent to the end.

            addParentStack(parent.getComponent());

            addNextIntent(parent);

        }

        return this;

    }
@@ -155,24 +143,7 @@ public class TaskStackBuilder { 
     * @return This TaskStackBuilder for method chaining

     */

    public TaskStackBuilder addParentStack(Class<?> sourceActivityClass) {

        final int insertAt = mIntents.size();

        PackageManager pm = mSourceContext.getPackageManager();

        try {

            ActivityInfo info = pm.getActivityInfo(

                    new ComponentName(mSourceContext, sourceActivityClass), 0);

            String parentActivity = info.parentActivityName;

            while (parentActivity != null) {

                Intent parent = new Intent().setComponent(

                        new ComponentName(mSourceContext, parentActivity));

                mIntents.add(insertAt, parent);

                info = pm.getActivityInfo(parent.getComponent(), 0);

                parentActivity = info.parentActivityName;

            }

        } catch (NameNotFoundException e) {

            Log.e(TAG, "Bad ComponentName while traversing activity parent metadata");

            throw new IllegalArgumentException(e);

        }

        return this;

        return addParentStack(new ComponentName(mSourceContext, sourceActivityClass));

    }



    /**
@@ -191,11 +162,13 @@ public class TaskStackBuilder { 
            ActivityInfo info = pm.getActivityInfo(sourceActivityName, 0);

            String parentActivity = info.parentActivityName;

            while (parentActivity != null) {

                Intent parent = new Intent().setComponent(

                        new ComponentName(info.packageName, parentActivity));

                mIntents.add(insertAt, parent);

                info = pm.getActivityInfo(parent.getComponent(), 0);

                final ComponentName target = new ComponentName(mSourceContext, parentActivity);

                info = pm.getActivityInfo(target, 0);

                parentActivity = info.parentActivityName;

                final Intent parent = parentActivity == null && insertAt == 0

                        ? Intent.makeMainActivity(target)

                        : new Intent().setComponent(target);

                mIntents.add(insertAt, parent);

            }

        } catch (NameNotFoundException e) {

            Log.e(TAG, "Bad ComponentName while traversing activity parent metadata");