Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f625f0b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Update WindowInfosListener permissions" into udc-dev

parents eb3ef1ab 0525e9b1

services/surfaceflinger/SurfaceFlinger.cpp

+8 −2
Original line number Diff line number Diff line
@@ -8559,8 +8559,12 @@ binder::Status SurfaceComposerAIDL::getMaxAcquiredBufferCount(int32_t* buffers) 
binder::Status SurfaceComposerAIDL::addWindowInfosListener(

        const sp<gui::IWindowInfosListener>& windowInfosListener) {

    status_t status;

    const int pid = IPCThreadState::self()->getCallingPid();

    const int uid = IPCThreadState::self()->getCallingUid();

    if (uid == AID_SYSTEM || uid == AID_GRAPHICS) {

    // TODO(b/270566761) update permissions check so that only system_server and shell can add

    // WindowInfosListeners

    if (uid == AID_SYSTEM || uid == AID_GRAPHICS ||

        checkPermission(sAccessSurfaceFlinger, pid, uid)) {

        status = mFlinger->addWindowInfosListener(windowInfosListener);

    } else {

        status = PERMISSION_DENIED;
@@ -8571,8 +8575,10 @@ binder::Status SurfaceComposerAIDL::addWindowInfosListener( 
binder::Status SurfaceComposerAIDL::removeWindowInfosListener(

        const sp<gui::IWindowInfosListener>& windowInfosListener) {

    status_t status;

    const int pid = IPCThreadState::self()->getCallingPid();

    const int uid = IPCThreadState::self()->getCallingUid();

    if (uid == AID_SYSTEM || uid == AID_GRAPHICS) {

    if (uid == AID_SYSTEM || uid == AID_GRAPHICS ||

        checkPermission(sAccessSurfaceFlinger, pid, uid)) {

        status = mFlinger->removeWindowInfosListener(windowInfosListener);

    } else {

        status = PERMISSION_DENIED;