commit 4a474e8ed9f5714bd540a7714a4f062fc76f6226
author Ady Abraham <adyabr@google.com> Fri Oct 02 15:47:55 2020 -0700
committer Ady Abraham <adyabr@google.com> Mon Oct 05 17:52:58 2020 +0000
tree a91bd454c3f82a7ef961898809428cd9536dc518
parent aa4bbda744cd0eabcb6608dd2c06851aa91bfcb4

SurfaceFlinger: fix a crash with RefreshRateOverlay

 - Fix a nullptr deference in createLayer
 - Add a test for RefreshRateOverlay

Test: adb shell /data/nativetest64/SurfaceFlinger_test/SurfaceFlinger_test
Bug: 169867983
Change-Id: I496aaeceaa86b55f806ddc921fc5b050417725b7

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index df87e3b..d127ef4 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3942,7 +3942,9 @@
     mInterceptor->saveSurfaceCreation(layer);
 
     setTransactionFlags(eTransactionNeeded);
-    *outId = layer->sequence;
+    if (outId) {
+        *outId = layer->sequence;
+    }
     return result;
 }