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

Commit f615179e authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by android-build-merger
Browse files

Merge "libcameraservice: Allow media server to disconnect camera even unlocked" 

am: a68b10a4

* commit 'a68b10a4':
  libcameraservice: Allow media server to disconnect camera even unlocked
parents 34314fae a68b10a4

services/camera/libcameraservice/api1/CameraClient.cpp

+0 −5
Original line number Original line Diff line number Diff line
@@ -236,11 +236,6 @@ void CameraClient::disconnect() { 
        return;

        return;

    }

    }





    if (mClientPid <= 0) {

        LOG1("camera is unlocked (mClientPid = %d), don't tear down hardware", mClientPid);

        return;

    }



    // Make sure disconnect() is done once and once only, whether it is called

    // Make sure disconnect() is done once and once only, whether it is called

    // from the user directly, or called by the destructor.

    // from the user directly, or called by the destructor.

    if (mHardware == 0) return;

    if (mHardware == 0) return;