From c5fc4611169721ff51597843722aff2e34f75426 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Tue, 5 Dec 2017 11:55:40 -0800
Subject: SurfaceControl: Fix Global Transaction locking error.

Simple mistake. Change from one branch didn't get propagated forward
during review.

Bug: 69974273
Test: Boots
Change-Id: I4df8a939f2b38202ada2d1dc150b56ec5dc8f496
---
 core/java/android/view/SurfaceControl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index 37550d87adf3..ea39b80eae95 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -667,7 +667,7 @@ public class SurfaceControl {
      */
     @Deprecated
     public static void mergeToGlobalTransaction(Transaction t) {
-        synchronized(sGlobalTransaction) {
+        synchronized(SurfaceControl.class) {
             sGlobalTransaction.merge(t);
         }
     }
-- 
cgit v1.2.3-59-g8ed1b