Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Riddle Hsu
2023-03-07 15:47:45 +00:00
committed by Android (Google) Code Review
parent cb924c504d 1c101906a9
commit 3222c82692
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityClientController.java
View File

@@ -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);
}
}

6
services/core/java/com/android/server/wm/EventLogTags.logtags
View File

@@ -1,4 +1,4 @@
# 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)

7
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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, "