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

Commit a4c36361 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Sync code with commit d582aff2"

parents 8c878f6b 3d0235df

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

+1 −1
Original line number Diff line number Diff line
@@ -1848,7 +1848,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();

    }