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

Commit 3a119b9e authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Stop supporting System UID to embed a separate task" into tm-dev am: dac2c8c6 

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

Change-Id: Ic8c84788cb7e9c5f6d946c5f547e6e4395752855
parents c4e54874 dac2c8c6

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

+3 −13
Original line number Diff line number Diff line
@@ -2023,22 +2023,12 @@ class ActivityStarter { 
    private boolean canEmbedActivity(@NonNull TaskFragment taskFragment,

            @NonNull ActivityRecord starting, boolean newTask, Task targetTask) {

        final Task hostTask = taskFragment.getTask();

        if (hostTask == null) {

        // Not allowed embedding a separate task or without host task.

        if (hostTask == null || newTask || targetTask != hostTask) {

            return false;

        }



        // Allowing the embedding if the task is owned by system.

        final int hostUid = hostTask.effectiveUid;

        if (UserHandle.getAppId(hostUid) == Process.SYSTEM_UID) {

            return true;

        }



        if (!taskFragment.isAllowedToEmbedActivity(starting)) {

            return false;

        }



        // Not allowed embedding task.

        return !newTask && (targetTask == null || targetTask == hostTask);

        return taskFragment.isAllowedToEmbedActivity(starting);

    }



    /**