commit 2ab3009f7a2d6403b4cda5b30504ee4a10fea1b0
author android-build-team Robot <android-build-team-robot@google.com> Thu Nov 12 04:42:31 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 12 04:42:31 2020 +0000
tree 24704f46d9e38119088b9d291e3d2e01538eeb0a
parent 9243c1057f9c81734e0ce2413d1405d9aba04200
parent 669090928a6a6e87f36d07d63c14ea1b97f38d37

Snap for 6881776 from 669090928a6a6e87f36d07d63c14ea1b97f38d37 to rvc-qpr1-d-release

Change-Id: I96fc3863a8828793d09ba565dd541a158bdfdfda

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index c9e595a..148749e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6227,11 +6227,6 @@
         Mutex::Autolock lock(mStateLock);
         if (authenticateSurfaceTextureLocked(surface)) {
             sp<Layer> layer = (static_cast<MonitoredProducer*>(surface.get()))->getLayer();
-            if (layer == nullptr) {
-                ALOGE("Attempt to set frame rate on a layer that no longer exists");
-                return BAD_VALUE;
-            }
-
             if (layer->setFrameRate(
                         Layer::FrameRate(frameRate,
                                          Layer::FrameRate::convertCompatibility(compatibility)))) {