diff options
| author | 2017-12-06 03:51:41 +0000 | |
|---|---|---|
| committer | 2017-12-06 03:51:41 +0000 | |
| commit | 473b5606c9b2b6b0ee85e0cf4b9401f387b82a2e (patch) | |
| tree | 856f2b682a0230cba2fa9718f451c80ac2e8dbf5 | |
| parent | 1e5183f4550141bf7d79388e0a63317c76803225 (diff) | |
| parent | c5fc4611169721ff51597843722aff2e34f75426 (diff) | |
Merge "SurfaceControl: Fix Global Transaction locking error."
| -rw-r--r-- | core/java/android/view/SurfaceControl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index e3da757fa74f..420a1bb34d28 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -702,7 +702,7 @@ public class SurfaceControl implements Parcelable { */ @Deprecated public static void mergeToGlobalTransaction(Transaction t) { - synchronized(sGlobalTransaction) { + synchronized(SurfaceControl.class) { sGlobalTransaction.merge(t); } } |