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

Commit da013597 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 1de65a91: Merge "Fix error message to match CTS" into jb-mr2-dev 

* commit '1de65a91':
  Fix error message to match CTS
parents e3cf96cc 1de65a91

services/medialog/MediaLogService.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,9 @@ status_t MediaLogService::dump(int fd, const Vector<String16>& args) 
    static const String16 sDump("android.permission.DUMP");

    static const String16 sDump("android.permission.DUMP");

    if (!(IPCThreadState::self()->getCallingUid() == AID_MEDIA ||

    if (!(IPCThreadState::self()->getCallingUid() == AID_MEDIA ||

            PermissionCache::checkCallingPermission(sDump))) {

            PermissionCache::checkCallingPermission(sDump))) {

        fdprintf(fd, "Permission denied.\n");

        fdprintf(fd, "Permission Denial: can't dump media.log from pid=%d, uid=%d\n",

                IPCThreadState::self()->getCallingPid(),

                IPCThreadState::self()->getCallingUid());

        return NO_ERROR;

        return NO_ERROR;

    }

    }