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

Commit bf71c025 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16961349

Change-Id: I84aedd95be01bec2daf057af34d31c9220e8a27c
parents 92bc1bf5 7221a25a

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

+3 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ class LaunchParamsPersister { 


    void saveTask(Task task, DisplayContent display) {

        final ComponentName name = task.realActivity;

        if (name == null) {

            return;

        }

        final int userId = task.mUserId;

        PersistableLaunchParams params;

        ArrayMap<ComponentName, PersistableLaunchParams> map = mLaunchParamsMap.get(userId);

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

+45 −17
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.os.Debug;

import android.os.IBinder;

import android.os.Process;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.Trace;
@@ -227,6 +228,11 @@ class Task extends WindowContainer<WindowContainer> { 
    // Do not move the stack as a part of reparenting

    static final int REPARENT_LEAVE_STACK_IN_PLACE = 2;



    /**

     * Used to identify if the activity that is installed from device's system image.

     */

    boolean mIsEffectivelySystemApp;



    String affinity;        // The affinity name for this task, or null; may change identity.

    String rootAffinity;    // Initial base affinity, or null; does not change from initial root.

    String mWindowLayoutAffinity; // Launch param affinity of this task or null. Used when saving
@@ -477,11 +483,24 @@ class Task extends WindowContainer<WindowContainer> { 


            if (r.finishing) return false;



            if (mRoot == null || mRoot.finishing) {

                // Set this as the candidate root since it isn't finishing.

                mRoot = r;

            }



            // Only end search if we are ignore relinquishing identity or we are not relinquishing.

            return ignoreRelinquishIdentity || (r.info.flags & FLAG_RELINQUISH_TASK_IDENTITY) == 0;

            final int uid = mRoot == r ? effectiveUid : r.info.applicationInfo.uid;

            if (ignoreRelinquishIdentity

                    || (mRoot.info.flags & FLAG_RELINQUISH_TASK_IDENTITY) == 0

                    || (mRoot.info.applicationInfo.uid != Process.SYSTEM_UID

                    && !mRoot.info.applicationInfo.isSystemApp()

                    && mRoot.info.applicationInfo.uid != uid)) {

                // No need to relinquish identity, end search.

                return true;

            }



            // Relinquish to next activity

            mRoot = r;

            return false;

        }

    }
@@ -929,12 +948,19 @@ class Task extends WindowContainer<WindowContainer> { 
     * @param info The activity info which could be different from {@code r.info} if set.

     */

    void setIntent(ActivityRecord r, @Nullable Intent intent, @Nullable ActivityInfo info) {

        boolean updateIdentity = false;

        if (this.intent == null) {

            updateIdentity = true;

        } else if (!mNeverRelinquishIdentity) {

            final ActivityInfo activityInfo = info != null ? info : r.info;

            updateIdentity = (effectiveUid == Process.SYSTEM_UID || mIsEffectivelySystemApp

                    || effectiveUid == activityInfo.applicationInfo.uid);

        }

        if (updateIdentity) {

            mCallingUid = r.launchedFromUid;

            mCallingPackage = r.launchedFromPackage;

            mCallingFeatureId = r.launchedFromFeatureId;

            setIntent(intent != null ? intent : r.intent, info != null ? info : r.info);

        setLockTaskAuth(r);



            final WindowContainer parent = getParent();

            if (parent != null) {

                final Task t = parent.asTask();
@@ -943,13 +969,14 @@ class Task extends WindowContainer<WindowContainer> { 
                }

            }

        }

        setLockTaskAuth(r);

    }



    /** Sets the original intent, _without_ updating the calling uid or package. */

    private void setIntent(Intent _intent, ActivityInfo info) {

        final boolean isLeaf = isLeafTask();

        if (intent == null) {

            mNeverRelinquishIdentity =

                    (info.flags & FLAG_RELINQUISH_TASK_IDENTITY) == 0;

            mNeverRelinquishIdentity = (info.flags & FLAG_RELINQUISH_TASK_IDENTITY) == 0;

        } else if (mNeverRelinquishIdentity && isLeaf) {

            return;

        }
@@ -962,6 +989,7 @@ class Task extends WindowContainer<WindowContainer> { 
            rootAffinity = affinity;

        }

        effectiveUid = info.applicationInfo.uid;

        mIsEffectivelySystemApp = info.applicationInfo.isSystemApp();

        stringName = null;



        if (info.targetActivity == null) {

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

+44 −0
Original line number Diff line number Diff line
@@ -616,6 +616,7 @@ public class TaskRecordTests extends ActivityTestsBase { 
        // one above as finishing.

        final ActivityRecord activity0 = task.getBottomMostActivity();

        activity0.info.flags |= FLAG_RELINQUISH_TASK_IDENTITY;

        task.effectiveUid = activity0.getUid();

        final ActivityRecord activity1 = new ActivityBuilder(mService).setTask(task).build();

        activity1.finishing = true;

        new ActivityBuilder(mService).setTask(task).build();
@@ -650,6 +651,7 @@ public class TaskRecordTests extends ActivityTestsBase { 
        // Set relinquishTaskIdentity for all activities in the task

        final ActivityRecord activity0 = task.getBottomMostActivity();

        activity0.info.flags |= FLAG_RELINQUISH_TASK_IDENTITY;

        task.effectiveUid = activity0.getUid();

        final ActivityRecord activity1 = new ActivityBuilder(mService).setTask(task).build();

        activity1.info.flags |= FLAG_RELINQUISH_TASK_IDENTITY;
@@ -802,6 +804,7 @@ public class TaskRecordTests extends ActivityTestsBase { 
        // Make the current root activity relinquish task identity

        final ActivityRecord activity0 = task.getBottomMostActivity();

        activity0.info.flags |= FLAG_RELINQUISH_TASK_IDENTITY;

        task.effectiveUid = activity0.getUid();

        // Add an extra activity on top - this will be the new root

        final ActivityRecord activity1 = new ActivityBuilder(mService).setTask(task).build();

        // Add one more on top
@@ -896,6 +899,47 @@ public class TaskRecordTests extends ActivityTestsBase { 
        verify(task).setIntent(eq(activity0));

    }



    /**

     * Test {@link Task#updateEffectiveIntent()} when activity with relinquishTaskIdentity but

     * another with different uid. This should make the task use the root activity when updating the

     * intent.

     */

    @Test

    public void testUpdateEffectiveIntent_relinquishingWithDifferentUid() {

        final ActivityRecord activity0 = new ActivityBuilder(mService)

                .setActivityFlags(FLAG_RELINQUISH_TASK_IDENTITY).setCreateTask(true).build();

        final Task task = activity0.getTask();



        // Add an extra activity on top

        new ActivityBuilder(mService).setUid(11).setTask(task).build();



        spyOn(task);

        task.updateEffectiveIntent();

        verify(task).setIntent(eq(activity0));

    }



    /**

     * Test {@link Task#updateEffectiveIntent()} with activities set as relinquishTaskIdentity.

     * This should make the task use the topmost activity when updating the intent.

     */

    @Test

    public void testUpdateEffectiveIntent_relinquishingMultipleActivities() {

        final ActivityRecord activity0 = new ActivityBuilder(mService)

                .setActivityFlags(FLAG_RELINQUISH_TASK_IDENTITY).setCreateTask(true).build();

        final Task task = activity0.getTask();

        task.effectiveUid = activity0.getUid();

        // Add an extra activity on top

        final ActivityRecord activity1 = new ActivityBuilder(mService).setTask(task).build();

        activity1.info.flags |= FLAG_RELINQUISH_TASK_IDENTITY;



        // Add an extra activity on top

        final ActivityRecord activity2 = new ActivityBuilder(mService).setTask(task).build();



        spyOn(task);

        task.updateEffectiveIntent();

        verify(task).setIntent(eq(activity2));

    }



    @Test

    public void testSaveLaunchingStateWhenConfigurationChanged() {

        LaunchParamsPersister persister = mService.mStackSupervisor.mLaunchParamsPersister;