diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-23 18:49:39 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-23 18:49:39 +0000 |
| commit | 5c4c8516a8aa37d1f739f8b820245c79e0c490f7 (patch) | |
| tree | 19d2082c959f0fffe1039d3876ee79d5c0e2bd15 | |
| parent | 7d951867416234a6f3228eb9d888009184b1d0b7 (diff) | |
| parent | 532673222decc40b3179e18886b4247c3b9fa88d (diff) | |
| download | native-oreo-r3-release.tar.gz | |
Merge cherrypicks of [2779825, 2780206, 2780207, 2780102, 2780103, 2779826, 2779827, 2779722, 2779723, 2779973, 2780208, 2780209, 2780210, 2780211, 2780212, 2780213, 2779703, 2779704, 2779705, 2779706, 2779707, 2779708, 2779709, 2780214, 2779828, 2779829, 2779454, 2779724] into oc-r3-releaseandroid-8.0.0_r30android-8.0.0_r15oreo-r3-release
Change-Id: Ic3903f1b98d5c67903378914c731556d3753fb62
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 88a5bd4a06..230520611b 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -2682,7 +2682,7 @@ Transform Layer::getTransform() const { // 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) { |