From 552da0e0cdf40ae7849a86457072028a0d604724 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Mon, 12 Jun 2017 11:43:51 -0700
Subject: [PATCH] SurfaceView: Fix missing override for SurfaceControl proxy

I will not pretend classes are interfaces...I will not pretend
classes are interfaces...

Bug: 62444724
Test: cts-tradefed run singleCommand cts -d -o --module CtsViewTestCases --test android.view.cts.SurfaceViewSyncTest#testSurfaceViewBigScale
      go/wm-smoke

Change-Id: Iccca46edcd669430c32f31e9c7d8aba1db254f2d
---
 core/java/android/view/SurfaceView.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index ef78559e2b535..679a9cd92bc27 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -1196,6 +1196,12 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
             mBackgroundControl.deferTransactionUntil(handle, frame);
         }
 
+        @Override
+        public void deferTransactionUntil(Surface barrier, long frame) {
+            super.deferTransactionUntil(barrier, frame);
+            mBackgroundControl.deferTransactionUntil(barrier, frame);
+        }
+
         void updateBackgroundVisibility() {
             if (mOpaque && mVisible) {
                 mBackgroundControl.show();