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

Merge "Fix stuck screen from display change timeout"

Browse Source
This commit is contained in:
Nick Chameyev
2023-04-28 12:50:45 +00:00
committed by Gerrit Code Review
parent ac189d4a55 1e022839ca
commit 2421332152
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/RemoteDisplayChangeController.java
View File

@@ -114,10 +114,16 @@ public class RemoteDisplayChangeController {
// timed-out, so run all continue callbacks and clear the list // timed-out, so run all continue callbacks and clear the list
synchronized (mService.mGlobalLock) { synchronized (mService.mGlobalLock) {
for (int i = 0; i < mCallbacks.size(); ++i) { for (int i = 0; i < mCallbacks.size(); ++i) {
mCallbacks.get(i).onContinueRemoteDisplayChange(null /* transaction */); final ContinueRemoteDisplayChangeCallback callback = mCallbacks.get(i);
} if (i == mCallbacks.size() - 1) {
// Clear all callbacks before calling the last one, so that if the callback
// itself calls {@link #isWaitingForRemoteDisplayChange()}, it will get
// {@code false}. After all, there is nothing pending after this one.
mCallbacks.clear(); mCallbacks.clear();
} }
callback.onContinueRemoteDisplayChange(null /* transaction */);
}
}
} }
private void continueDisplayChange(@NonNull ContinueRemoteDisplayChangeCallback callback, private void continueDisplayChange(@NonNull ContinueRemoteDisplayChangeCallback callback,