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

Commit 32047499 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Use timestamp from camera driver for CameraSource" into kraken

parents fa8e0c18 f06bb989
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@
** limitations under the License.
*/

//#define LOG_NDEBUG 0
#define LOG_TAG "CameraService"
#include <utils/Log.h>

@@ -247,7 +248,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService,
status_t CameraService::Client::checkPid()
{
    int callingPid = getCallingPid();
    if (mClientPid == callingPid) return NO_ERROR;
    if (mClientPid == callingPid || callingPid == getpid()) return NO_ERROR;
    LOGW("Attempt to use locked camera (client %p) from different process "
        " (old pid %d, new pid %d)",
        getCameraClient()->asBinder().get(), mClientPid, callingPid);