diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-22 23:24:27 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-22 23:24:27 +0000 |
| commit | 30fdd01f2e69f8235dafe4cb2fef2577d48458f3 (patch) | |
| tree | 19d2082c959f0fffe1039d3876ee79d5c0e2bd15 | |
| parent | 7d951867416234a6f3228eb9d888009184b1d0b7 (diff) | |
| parent | 5bf8fc7edec7fcb8cdacec63cd4dcca29ffbeb38 (diff) | |
| download | native-oreo-release.tar.gz | |
Merge cherrypicks of [2775115, 2774970, 2775080, 2774971, 2775063, 2775066, 2775357, 2775358, 2774351, 2774352, 2774797, 2774798, 2775359, 2775360, 2775361, 2775362, 2775363, 2774972, 2774973, 2774974, 2774975, 2774976, 2774977, 2774978, 2775397, 2774353, 2774354, 2774355, 2774907] into oc-releaseandroid-8.0.0_r28android-8.0.0_r13oreo-release
Change-Id: If0b52bacdd9c619f4e145af23360c89902547b4c
| -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) { |