diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-10-06 20:11:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-06 20:11:18 +0000 |
| commit | 4f08186dd242c14b9339590152f7f8d8790cd930 (patch) | |
| tree | 19d2082c959f0fffe1039d3876ee79d5c0e2bd15 | |
| parent | 7d951867416234a6f3228eb9d888009184b1d0b7 (diff) | |
| parent | 299a5fce6f945d2bcfce8a0e2b0daeb631ad8522 (diff) | |
| download | native-oreo-cts-release.tar.gz | |
Merge "Snap for 4379964 from 30fdd01f2e69f8235dafe4cb2fef2577d48458f3 to oreo-cts-release" into oreo-cts-releaseandroid-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10oreo-cts-release
| -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) { |