commit 76923a32ab6ea25115b65ff86ade7235ba7b3a33
author Valerie Hau <vhau@google.com> Fri Jul 17 17:18:40 2020 -0700
committer Anis Assi <anisassi@google.com> Thu Aug 06 17:13:34 2020 -0700
tree c6d835c4ba6b8f7cf800b00b75067a3df1679642
parent 564bf677ccfc9a9e35e068e6f329d401802b8871

Fixing small bug for sec release

Bug: 150845631, 137284057
Test: build, boot, SurfaceFlinger_test, libsurfaceflinger_unittest
Change-Id: I9b7ab17ea0f7fb7723a7d5bf914041b1b45a59d3
(cherry picked from commit 9a17ac2ca4beb9504f006487d4e6d72428c5f421)

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index ba203bd..6dde739 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3675,7 +3675,7 @@
     // called by a client when it wants to remove a Layer
     status_t err = NO_ERROR;
     sp<Layer> l = fromHandle(handle);
-    if (l != nullptr || client->isAttached(handle)) {
+    if (l != nullptr && client->isAttached(handle)) {
         mInterceptor->saveSurfaceDeletion(l);
         err = removeLayerLocked(mStateLock, l);
         ALOGE_IF(err<0 && err != NAME_NOT_FOUND,