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

Commit 83c15e01 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken

parents b2030f3b c419e471
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -371,10 +371,7 @@ CameraService::Client::~Client() {
status_t CameraService::Client::checkPid() const {
    int callingPid = getCallingPid();
    if (callingPid == mClientPid) return NO_ERROR;
    if (callingPid == getpid()) {
        LOGW("FIXME: use camera from mediaserver without permission.");
        return NO_ERROR;
    }

    LOGW("attempt to use a locked camera from a different process"
         " (old pid %d, new pid %d)", mClientPid, callingPid);
    return EBUSY;