Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc

am: 2fa5800da9

Change-Id: I83c4a2e592b7385b1aa6dc3157bd6ea5950c624a

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();