diff options
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 14 | 
1 files changed, 7 insertions, 7 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index fe2db940f7..db205b8a95 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -6158,8 +6158,7 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, const std::string& comp                    windowInfosDebug.maxSendDelayVsyncId.value);      StringAppendF(&result, "  max send delay (ns): %" PRId64 " ns\n",                    windowInfosDebug.maxSendDelayDuration); -    StringAppendF(&result, "  unsent messages: %" PRIu32 "\n", -                  windowInfosDebug.pendingMessageCount); +    StringAppendF(&result, "  unsent messages: %zu\n", windowInfosDebug.pendingMessageCount);      result.append("\n");  } @@ -7992,9 +7991,9 @@ void SurfaceFlinger::onActiveDisplayChangedLocked(const DisplayDevice* inactiveD                                     forceApplyPolicy);  } -status_t SurfaceFlinger::addWindowInfosListener( -        const sp<IWindowInfosListener>& windowInfosListener) { -    mWindowInfosListenerInvoker->addWindowInfosListener(windowInfosListener); +status_t SurfaceFlinger::addWindowInfosListener(const sp<IWindowInfosListener>& windowInfosListener, +                                                gui::WindowInfosListenerInfo* outInfo) { +    mWindowInfosListenerInvoker->addWindowInfosListener(windowInfosListener, outInfo);      setTransactionFlags(eInputInfoUpdateNeeded);      return NO_ERROR;  } @@ -9076,7 +9075,8 @@ binder::Status SurfaceComposerAIDL::getMaxAcquiredBufferCount(int32_t* buffers)  }  binder::Status SurfaceComposerAIDL::addWindowInfosListener( -        const sp<gui::IWindowInfosListener>& windowInfosListener) { +        const sp<gui::IWindowInfosListener>& windowInfosListener, +        gui::WindowInfosListenerInfo* outInfo) {      status_t status;      const int pid = IPCThreadState::self()->getCallingPid();      const int uid = IPCThreadState::self()->getCallingUid(); @@ -9084,7 +9084,7 @@ binder::Status SurfaceComposerAIDL::addWindowInfosListener(      // WindowInfosListeners      if (uid == AID_SYSTEM || uid == AID_GRAPHICS ||          checkPermission(sAccessSurfaceFlinger, pid, uid)) { -        status = mFlinger->addWindowInfosListener(windowInfosListener); +        status = mFlinger->addWindowInfosListener(windowInfosListener, outInfo);      } else {          status = PERMISSION_DENIED;      }  |