From: Fabien Sanglard <sanglardf@google.com>
Date: Thu, 2 Feb 2017 20:15:42 +0000 (+0000)
Subject: Fix security vulnerability am: 45b202513b
X-Git-Tag: android-x86-7.1-r1~21^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=18a5e5f607511195376d5a11fa75b1b1d807daa0;hp=-c;p=android-x86%2Fframeworks-native.git

Fix security vulnerability am: 45b202513b
am: 8778a131c2

Change-Id: Ic9300f2597702d6e83d80222dbc5ca7d2642f621
---

18a5e5f607511195376d5a11fa75b1b1d807daa0
diff --combined services/surfaceflinger/SurfaceFlinger_hwc1.cpp
index b0f418c4fe,98943d247c..b32f652e83
--- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
+++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
@@@ -467,7 -467,7 +467,7 @@@ void SurfaceFlinger::init() 
  
      // set SFEventThread to SCHED_FIFO to minimize jitter
      struct sched_param param = {0};
 -    param.sched_priority = 1;
 +    param.sched_priority = 2;
      if (sched_setscheduler(mSFEventThread->getTid(), SCHED_FIFO, &param) != 0) {
          ALOGE("Couldn't set SCHED_FIFO for SFEventThread");
      }
@@@ -2203,8 -2203,7 +2203,7 @@@ void SurfaceFlinger::setTransactionStat
          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);
                  }