summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-07-07 03:12:43 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-07-07 03:12:43 +0000
commit77cb7cfd1ab3bdacf35d4a0c8d4708410b205a3d (patch)
tree9b9fbb8b8620a59069f36a9d830c6b3a9b682709
parent1c47a6ca8533ec1650b4aac25c1cf45d3fcaf2bf (diff)
parentf0d3d3c06dd71453457035914a41872421f2932d (diff)
downloadbase-77cb7cfd1ab3bdacf35d4a0c8d4708410b205a3d.tar.gz
Merge cherrypicks of [2507192] into oc-releaseandroid-cts-8.0_r1
Change-Id: I056e9eb24334d18b675c71d452f521973c4a82ed
-rw-r--r--core/java/android/view/SurfaceView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index b035b7fd53ed..a19f05c6ae38 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -491,10 +491,10 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
if (myHeight <= 0) myHeight = getHeight();
final boolean formatChanged = mFormat != mRequestedFormat;
- final boolean creating = (mSurfaceControl == null || formatChanged)
+ final boolean visibleChanged = mVisible != mRequestedVisible;
+ final boolean creating = (mSurfaceControl == null || formatChanged || visibleChanged)
&& mRequestedVisible;
final boolean sizeChanged = mSurfaceWidth != myWidth || mSurfaceHeight != myHeight;
- final boolean visibleChanged = mVisible != mRequestedVisible;
final boolean windowVisibleChanged = mWindowVisibility != mLastWindowVisibility;
boolean redrawNeeded = false;