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

Commit e8c2f381 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not save the resolved target component in task intent"

parents 3b07fcbf 96c7b83f

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

+0 −1
Original line number Diff line number Diff line
@@ -911,7 +911,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) {