commit b3d13a3bf975972c90a15d778690c055dc4c6006
author gitbuildkicker <android-build@google.com> Sun Feb 05 00:09:55 2017 -0800
committer gitbuildkicker <android-build@google.com> Sun Feb 05 00:09:55 2017 -0800
tree 33cfbca4a51394868464cb1d586878af65136481
parent a27b8d6f0b3e466c5f7a80b3818a7b22d4d32227
parent f0b3059146a034022807494295899011e458452c

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

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
index b0f418c..b32f652 100644
--- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
+++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
@@ -2203,8 +2203,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);
                 }