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

Commit 96c7b83f authored by Louis Chang's avatar Louis Chang
Browse files

Do not save the resolved target component in task intent 

The target component was resolved and being stored in the
task intent when starting an alias activity. So, the target
component were directly being used for the launches while
restarting the app from Recents.

Bug: 117677267
Test: atest TaskRecordTests

Change-Id: I7df9efb908c3b0d2872d572b671901724c949515
parent 474dffd2

services/core/java/com/android/server/wm/TaskRecord.java

+0 −1
Original line number Diff line number Diff line
@@ -885,7 +885,6 @@ class TaskRecord extends ConfigurationContainer { 
                    info.packageName, info.targetActivity);

            if (_intent != null) {

                Intent targetIntent = new Intent(_intent);

                targetIntent.setComponent(targetComponent);

                targetIntent.setSelector(null);

                targetIntent.setSourceBounds(null);

                if (DEBUG_TASKS) Slog.v(TAG_TASKS,

services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java

+19 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.app.ActivityManager; 
import android.content.ComponentName;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.platform.test.annotations.Presubmit;
@@ -180,6 +181,24 @@ public class TaskRecordTests extends ActivityTestsBase { 
                mParentBounds);

    }



    /** Ensures that the alias intent won't have target component resolved. */

    @Test

    public void testTaskIntentActivityAlias() {

        final String aliasActivity = DEFAULT_COMPONENT_PACKAGE_NAME + ".aliasActivity";

        final String targetActivity = DEFAULT_COMPONENT_PACKAGE_NAME + ".targetActivity";

        final Intent intent = new Intent();

        intent.setComponent(new ComponentName(DEFAULT_COMPONENT_PACKAGE_NAME, aliasActivity));

        final ActivityInfo info = new ActivityInfo();

        info.applicationInfo = new ApplicationInfo();

        info.packageName = DEFAULT_COMPONENT_PACKAGE_NAME;

        info.targetActivity = targetActivity;



        final TaskRecord task = TaskRecord.create(mService, 1 /* taskId */, info, intent,

                null /* taskDescription */);

        assertEquals("The alias activity component should be saved in task intent.", aliasActivity,

                task.intent.getComponent().getClassName());

    }



    private void testStackBoundsConfiguration(int windowingMode, Rect parentBounds, Rect bounds,

            Rect expectedConfigBounds) {