| commit | 8aee36b0c2ffa546da56109defcf61bf63848f71 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sun Dec 06 19:59:05 2020 -0800 |
| committer | Xin Li <delphij@google.com> | Mon Dec 07 00:39:42 2020 -0800 |
| tree | 51494e1ad64913701e43ed24617a9b8d920984df | |
| parent | 62cb684c8e2aa6344141ba0136c24259acf85d5d [diff] | |
| parent | 9243c1057f9c81734e0ce2413d1405d9aba04200 [diff] |
DO NOT MERGE - Merge RQ1A.201205.011 Bug: 172690556 Merged-In: Ice1edd7c5320f4d1d915643e30430919de258dbc Change-Id: Ieaedbe45a0a7bae6579eb1f40bf497889ada405f
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 9e2ce22..39f923f 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6228,6 +6228,11 @@ 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)))) {