commit 58e1ce0b3b6881d2ac3ff3bfd4b0548c121286ea
author Steven Moreland <smoreland@google.com> Tue Mar 24 22:55:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 24 22:55:28 2020 +0000
tree 768e86dc9c2fce319f10adb7a7c09158921a5ea9
parent 926b76a5193cfe5fbaef78649ff5e2db34b215a7
parent 4271f564399e35186473ccd2d70b45bb5038c97a

sf: avoid assumption remote binder is local am: 4271f56439

Change-Id: If5eac57b39b2679782416edc8c3296e9be358a14

services/surfaceflinger/RegionSamplingThread.cpp

diff --git a/services/surfaceflinger/RegionSamplingThread.cpp b/services/surfaceflinger/RegionSamplingThread.cpp
index 07fdead..80da154 100644
--- a/services/surfaceflinger/RegionSamplingThread.cpp
+++ b/services/surfaceflinger/RegionSamplingThread.cpp
@@ -200,9 +200,10 @@
 
 void RegionSamplingThread::addListener(const Rect& samplingArea, const sp<IBinder>& stopLayerHandle,
                                        const sp<IRegionSamplingListener>& listener) {
-    wp<Layer> stopLayer = stopLayerHandle != nullptr
-            ? static_cast<Layer::Handle*>(stopLayerHandle.get())->owner
-            : nullptr;
+    wp<Layer> stopLayer;
+    if (stopLayerHandle != nullptr && stopLayerHandle->localBinder() != nullptr) {
+        stopLayer = static_cast<Layer::Handle*>(stopLayerHandle.get())->owner;
+    }
 
     sp<IBinder> asBinder = IInterface::asBinder(listener);
     asBinder->linkToDeath(this);