diff options
| author | Fabien Sanglard <sanglardf@google.com> | 2017-01-18 16:43:18 -0800 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2017-02-21 17:19:23 -0800 |
| commit | 6cf7a6d18c11b2f7e8893282271beecd4071e244 (patch) | |
| tree | b38566eb834a65f8e6b0444c4fb9ed79016f0ff6 | |
| parent | 2a2753a6e5585b85fda350d7ca45964597b25705 (diff) | |
| download | native-6cf7a6d18c11b2f7e8893282271beecd4071e244.tar.gz | |
Fix security vulnerabilityandroid-7.0.0_r33
Change-Id: I4c9ea3a3177131fa29d2561da71ef18bec3af108
Test: angler, marlin
Bug: 32628763
(cherry picked from commit 45b202513ba7440beaefbf9928f73fb6683dcfbd)
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 3 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger_hwc1.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index a10a8138e3..4e97321dbf 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -2152,8 +2152,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); } diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp index 7f3b269f0e..8f6fd660e4 100644 --- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp +++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp @@ -2168,8 +2168,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); } |