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

Commit 5eb562f5 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Avoid resursion for sleep check in embedding window" am: e5053160 

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



Change-Id: I544ac6b7f6d9bafedf6c439ec64e12ede1d09af0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69cd53b1 e5053160

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1987,7 +1987,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
    }

    }





    boolean shouldSleepActivities() {

    boolean shouldSleepActivities() {

        return false;

        final Task task = getRootTask();

        return task != null && task.shouldSleepActivities();

    }

    }





    @Override

    @Override