commit f6868443ef7ff3465b87c615b3519f945d9224ef
author Fabien Sanglard <sanglardf@google.com> Thu Feb 02 01:59:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 02 01:59:36 2017 +0000
tree a0859c33b9857e595cde5ebc48ff5b5f872a1c2e
parent 44a6d5a5eb8c1a2683907da11f66fb87e8609769
parent 30ab1434c3d16743385a0b7afda8044094c35c1c

Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24 am: c7892d9d0b am: cca3b79c32 am: ebbf8a6b5a am: 5ba227f96e am: 40cd915a54 am: ded5521871 am: 0e0a258771 am: 6a5a220b48
am: 30ab1434c3

Change-Id: Iaa4ffc3bca279f294a36df31823ec9a30a728fe7

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index dabece2..76d518b 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2291,8 +2291,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);
                 }