commit 6a5a220b481d2014f2c0c523a41a57ee1b4374fa
author Fabien Sanglard <sanglardf@google.com> Thu Feb 02 01:54:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 02 01:54:35 2017 +0000
tree f9dbe418542042f30952b307ce9d345a4c4ec4d6
parent 68fcdf6a93f38b6afd5e8d29a01eb1fb21fcdb6c
parent 0e0a25877137154a5da927c6c0924d96b57fdee8

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

Change-Id: I4479a276592fc9d5d25378a5abee12473a2104ae

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 8db071e..8e7e577 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2287,8 +2287,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);
                 }