commit 773ff4f9e121790b668183fb6850328c74157525
author Bill Yi <byi@google.com> Wed Mar 15 09:51:43 2017 -0700
committer Bill Yi <byi@google.com> Wed Mar 15 09:51:43 2017 -0700
tree b04941d58dd7899ee8ab4791148d635529432ce4
parent b4ad8fd532d4a4dcc4329760b88e92ca0cf50181
parent 088c16befc277069488fa557d86570c78a22f419

Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEAD

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index fdc3650..9c0305d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2134,8 +2134,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);
                 }