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

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

Merge "RESTRICT AUTOMERGE Force screen freezing timeout to unfreeze" into tm-qpr-dev

parents cb924c50 1c101906

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

+2 −0
Original line number Diff line number Diff line
@@ -696,6 +696,8 @@ class ActivityClientController extends IActivityClientController.Stub { 
            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInRootTaskLocked(token);

                if (r != null) {

                    EventLogTags.writeWmSetRequestedOrientation(requestedOrientation,

                            r.shortComponentName);

                    r.setRequestedOrientation(requestedOrientation);

                }

            }

services/core/java/com/android/server/wm/EventLogTags.logtags

+5 −1
Original line number Diff line number Diff line 
# See system/core/logcat/event.logtags for a description of the format of this file.

# See system/logging/logcat/event.logtags for a description of the format of this file.



option java_package com.android.server.wm
@@ -62,6 +62,10 @@ option java_package com.android.server.wm 
31002 wm_task_moved (TaskId|1|5),(ToTop|1),(Index|1)

# Task removed with source explanation.

31003 wm_task_removed (TaskId|1|5),(Reason|3)



# Set the requested orientation of an activity.

31006 wm_set_requested_orientation (Orientation|1|5),(Component Name|3)



# bootanim finished:

31007 wm_boot_animation_done (time|2|3)

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

+4 −3
Original line number Diff line number Diff line
@@ -6198,9 +6198,10 @@ public class WindowManagerService extends IWindowManager.Stub 
            waitingForConfig = waitingForRemoteDisplayChange = false;

            numOpeningApps = 0;

        }

        if (waitingForConfig || waitingForRemoteDisplayChange || mAppsFreezingScreen > 0

                || mWindowsFreezingScreen == WINDOWS_FREEZING_SCREENS_ACTIVE

                || mClientFreezingScreen || numOpeningApps > 0) {

        final boolean waitingForApps = mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_TIMEOUT

                && (mAppsFreezingScreen > 0 || numOpeningApps > 0);

        if (waitingForConfig || waitingForRemoteDisplayChange || waitingForApps

                || mClientFreezingScreen) {

            ProtoLog.d(WM_DEBUG_ORIENTATION, "stopFreezingDisplayLocked: Returning "

                    + "waitingForConfig=%b, waitingForRemoteDisplayChange=%b, "

                    + "mAppsFreezingScreen=%d, mWindowsFreezingScreen=%d, "