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

Merge "Check if already on main thread when getting SSG for SCVH" into udc-dev

Browse Source
This commit is contained in:
Chavi Weingarten
2023-04-07 21:58:51 +00:00
committed by Android (Google) Code Review
parent b2c8f86c62 dbce4f859f
commit 5932006e17
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/view/SurfaceControlViewHost.java
View File

@@ -99,9 +99,16 @@ public class SurfaceControlViewHost {
@Override
public ISurfaceSyncGroup getSurfaceSyncGroup() {
CompletableFuture<ISurfaceSyncGroup> surfaceSyncGroup = new CompletableFuture<>();
mViewRoot.mHandler.post(
() -> surfaceSyncGroup.complete(
mViewRoot.getOrCreateSurfaceSyncGroup().mISurfaceSyncGroup));
// If the call came from in process and it's already running on the UI thread, return
// results immediately instead of posting to the main thread. If we post to the main
// thread, it will block itself and the return value will always be null.
if (Thread.currentThread() == mViewRoot.mThread) {
return mViewRoot.getOrCreateSurfaceSyncGroup().mISurfaceSyncGroup;
} else {
mViewRoot.mHandler.post(
() -> surfaceSyncGroup.complete(
mViewRoot.getOrCreateSurfaceSyncGroup().mISurfaceSyncGroup));
}
try {
return surfaceSyncGroup.get(1, TimeUnit.SECONDS);
} catch (InterruptedException | ExecutionException | TimeoutException e) {