Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc am: 2fa5800da9" into oc-dr1-dev-plus-aosp

2017-06-13 00:45:55 +00:00
parent ed30217c42 cb6196277f
commit 3c63cef6bf
1 changed files with 6 additions and 0 deletions
--- 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();