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

Commit 3d0235df authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Sync code with commit d582aff2 

The code was inconsistent in different branches.

Bug: 163976519
Test: WmTests
Change-Id: Ib1facc373658861aa5ac2a6a4074e40c07fadd44
parent 520f0183

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

+1 −1
Original line number Diff line number Diff line
@@ -1847,7 +1847,7 @@ class ActivityStarter { 
            ActivityRecord targetTopActivity =

                    targetTask != null ? targetTask.getTopNonFinishingActivity() : null;

            boolean passesAsmChecks = newTask

                    ? mRootWindowContainer.hasResumedActivity(callerUid)

                    ? mService.mVisibleActivityProcessTracker.hasResumedActivity(callerUid)

                    : targetTopActivity != null && targetTopActivity.getUid() == callerUid;



            if (!passesAsmChecks) {

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

+0 −4
Original line number Diff line number Diff line
@@ -1799,10 +1799,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        return getItemFromTaskDisplayAreas(TaskDisplayArea::getFocusedActivity);

    }



    boolean hasResumedActivity(int uid) {

        return forAllActivities(ar -> ar.isState(RESUMED) && ar.getUid() == uid);

    }



    boolean isTopDisplayFocusedRootTask(Task task) {

        return task != null && task == getTopDisplayFocusedRootTask();

    }