From: Fabien Sanglard <sanglardf@google.com>
Date: Thu, 2 Feb 2017 01:57:08 +0000 (+0000)
Subject: Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae... 
X-Git-Tag: android-x86-7.1-r1~22^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=30ab1434c3;hp=56ec3afb8444a9a7056b54601bb6031465113621;p=android-x86%2Fframeworks-native.git

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

Change-Id: I47743cb142bdb4f21202dc51482fc52996f6b7a4
---

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 8db071ed2f..8e7e5772b6 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2287,8 +2287,7 @@ void SurfaceFlinger::setTransactionState(
         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);
                 }