commit 132d0f2aefb36a0a83fc77460ed24383d0e3202a
author Fabien Sanglard <sanglardf@google.com> Thu Feb 02 01:31:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 02 01:31:32 2017 +0000
tree b329713365a8f674e8be081c0eaff977b80a3f58
parent 8b64307e958771edc465910e3c053cdc351dcafe
parent ac2b87ac0f613f9995b938a9157544cdd2dbe646

Fix security vulnerability am: 2ae83f4f62 am: 11ab583834
am: ac2b87ac0f

Change-Id: I3b249a9ec1820917dc015c72bd093535927c9ed6

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 96a8adb..73ba2e5 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1982,8 +1982,7 @@
         if (s.client != NULL) {
             sp<IBinder> binder = s.client->asBinder();
             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);
                 }