summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-12 23:38:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-12 23:38:19 +0000
commit42b3610adc4e52150ad6540e6cbdfc764c640362 (patch)
tree7e9dfe7b71e7fc14079e683480ced4dc57ee3a13 /core/java/android
parentbbd7dfc0a4cf157557685a221cf1119bcd417f66 (diff)
parent552da0e0cdf40ae7849a86457072028a0d604724 (diff)
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/SurfaceView.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index ef78559e2b53..679a9cd92bc2 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();