commit f0b3059146a034022807494295899011e458452c
author gitbuildkicker <android-build@google.com> Thu Feb 02 00:09:15 2017 -0800
committer gitbuildkicker <android-build@google.com> Thu Feb 02 00:09:15 2017 -0800
tree 58cadd6e1f4eb47d204f05fe97362a26d8ce5fe4
parent 81e84ad0721cda5a160bb13a0380a732622a590d
parent a2ca871c0d51dda5e4c4d4beee90793a799f3c70

merge in nyc-mr2-release history after reset to nyc-mr2-dev

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);
                 }