commit 089f039ade3ad734820cb50f48b1d38f7069f24c
author android-build-team Robot <android-build-team-robot@google.com> Sun Aug 20 01:06:00 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Aug 20 01:06:00 2017 +0000
tree 46237d896412bf91d1838d2155c7af3596de0fb2
parent c639d313efce590c78e3142475c3f0294ac66602
parent 29e5fa3fda233d78250c7b76222d4e251b26d480

release-request-4c58f975-7a8c-4f23-922b-75d1a4fcf38a-for-git_oc-vts-release-4287305 snap-temp-L67300000095126797

Change-Id: Id6a7cf767fe9dfd5ef12dc378a2d910c914ac7dd

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 88a5bd4..2305206 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -2682,7 +2682,7 @@
         // for in the transform. We need to mirror this scaling in child surfaces
         // or we will break the contract where WM can treat child surfaces as
         // pixels in the parent surface.
-        if (p->isFixedSize()) {
+        if (p->isFixedSize() && p->mActiveBuffer != nullptr) {
             int bufferWidth;
             int bufferHeight;
             if ((p->mCurrentTransform & NATIVE_WINDOW_TRANSFORM_ROT_90) == 0) {