commit f51ca9d18e343fd6d48be9316a08556b801f6266
author Bryce Lee <brycelee@google.com> Tue Jun 20 22:17:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 20 22:17:39 2017 +0000
tree 5da8821c14751ae7d6b707724bdc63e07e27bb9a
parent 8d189593b8dbf72a5f1068aa640701d3226adabb
parent d523125679dcd77f448e44565b9a47bfd35859cb

Merge "Limit creating new surface for legacy apps to size changes." into oc-dev
am: d523125679

Change-Id: I191b285ed3785f9937c91162d3aa875a285cb51a

core/java/android/view/SurfaceView.java

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 34ceeb7..7e0ade4 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -641,7 +641,7 @@
                         mSurface.copyFrom(mSurfaceControl);
                     }
 
-                    if (getContext().getApplicationInfo().targetSdkVersion
+                    if (sizeChanged && getContext().getApplicationInfo().targetSdkVersion
                             < Build.VERSION_CODES.O) {
                         // Some legacy applications use the underlying native {@link Surface} object
                         // as a key to whether anything has changed. In these cases, updates to the