commit cca3b79c3259eee98f27e7b5f1634de6b49cc902
author Fabien Sanglard <sanglardf@google.com> Thu Feb 02 01:38:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 02 01:38:33 2017 +0000
tree c8eb308643b5b4cff3f6b85fd216cad4a797843c
parent 79b74d787daa32d5e5d191e653b011d45d7f846c
parent c7892d9d0bfcfb356614bb652548d34bec85b628

Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24
am: c7892d9d0b

Change-Id: Ic59ba49542b907591f3e514ae0417ed82a5be7aa

services/surfaceflinger/SurfaceFlinger.cpp

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