commit f91ee50667e8ce754b137de426d41e487aa1a2da
author Fabien Sanglard <sanglardf@google.com> Thu Feb 02 20:18:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 02 20:18:12 2017 +0000
tree 73baa564af967e9dacc0607c43234bf4bfe2daf2
parent 30ab1434c3d16743385a0b7afda8044094c35c1c
parent 18a5e5f607511195376d5a11fa75b1b1d807daa0

Fix security vulnerability am: 45b202513b am: 8778a131c2
am: 18a5e5f607

Change-Id: Iec4b5c921b77fd29aea45bdb49cd4d7cda67edc6

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
index b0f418c..b32f652 100644
--- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
+++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
@@ -2203,8 +2203,7 @@
         if (s.client != NULL) {
             sp<IBinder> binder = IInterface::asBinder(s.client);
             if (binder != NULL) {
-                String16 desc(binder->getInterfaceDescriptor());
-                if (desc == ISurfaceComposerClient::descriptor) {
+                if (binder->queryLocalInterface(ISurfaceComposerClient::descriptor) != NULL) {
                     sp<Client> client( static_cast<Client *>(s.client.get()) );
                     transactionFlags |= setClientStateLocked(client, s.state);
                 }