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

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

Merge "Camera: Ensure that 'opChanged' can access a valid device instance"

parents e8f564ee fa17f09b

services/camera/libcameraservice/common/Camera2ClientBase.cpp

+8 −5
Original line number Diff line number Diff line
@@ -105,11 +105,6 @@ status_t Camera2ClientBase<TClientBase>::initializeImpl(TProviderPtr providerPtr 
          TClientBase::mCameraIdStr.string());

    status_t res;



    // Verify ops permissions

    res = TClientBase::startCameraOps();

    if (res != OK) {

        return res;

    }

    IPCTransport providerTransport = IPCTransport::INVALID;

    res = providerPtr->getCameraIdIPCTransport(TClientBase::mCameraIdStr.string(),

            &providerTransport);
@@ -145,6 +140,14 @@ status_t Camera2ClientBase<TClientBase>::initializeImpl(TProviderPtr providerPtr 
        return res;

    }



    // Verify ops permissions

    res = TClientBase::startCameraOps();

    if (res != OK) {

        TClientBase::finishCameraOps();

        mDevice.clear();

        return res;

    }



    wp<NotificationListener> weakThis(this);

    res = mDevice->setNotifyCallback(weakThis);

    if (res != OK) {