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

Commit beff1fb1 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix google-explicit-constructor warnings in camera." 

am: f9ee5183

Change-Id: I527e9527c65fbd1a4b9ac8fbf6f60ca60e830d02
parents f7dc6d0d f9ee5183

camera/ndk/impl/ACameraCaptureSession.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
using namespace android;



struct ACaptureSessionOutput {

    ACaptureSessionOutput(ANativeWindow* window) : mWindow(window) {};

    explicit ACaptureSessionOutput(ANativeWindow* window) : mWindow(window) {};



    bool operator == (const ACaptureSessionOutput& other) const {

        return mWindow == other.mWindow;

camera/ndk/impl/ACameraDevice.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class CameraDevice final : public RefBase { 
    // Callbacks from camera service

    class ServiceCallback : public hardware::camera2::BnCameraDeviceCallbacks {

      public:

        ServiceCallback(CameraDevice* device) : mDevice(device) {}

        explicit ServiceCallback(CameraDevice* device) : mDevice(device) {}

        binder::Status onDeviceError(int32_t errorCode,

                           const CaptureResultExtras& resultExtras) override;

        binder::Status onDeviceIdle() override;

camera/ndk/impl/ACameraManager.h

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ class CameraManagerGlobal final : public RefBase { 


    class DeathNotifier : public IBinder::DeathRecipient {

      public:

        DeathNotifier(CameraManagerGlobal* cm) : mCameraManager(cm) {}

        explicit DeathNotifier(CameraManagerGlobal* cm) : mCameraManager(cm) {}

      protected:

        // IBinder::DeathRecipient implementation

        virtual void binderDied(const wp<IBinder>& who);
@@ -71,7 +71,7 @@ class CameraManagerGlobal final : public RefBase { 


    class CameraServiceListener final : public hardware::BnCameraServiceListener {

      public:

        CameraServiceListener(CameraManagerGlobal* cm) : mCameraManager(cm) {}

        explicit CameraServiceListener(CameraManagerGlobal* cm) : mCameraManager(cm) {}

        virtual binder::Status onStatusChanged(int32_t status, int32_t cameraId);



        // Torch API not implemented yet
@@ -86,7 +86,7 @@ class CameraManagerGlobal final : public RefBase { 


    // Wrapper of ACameraManager_AvailabilityCallbacks so we can store it in std::set

    struct Callback {

        Callback(const ACameraManager_AvailabilityCallbacks *callback) :

        explicit Callback(const ACameraManager_AvailabilityCallbacks *callback) :

            mAvailable(callback->onCameraAvailable),

            mUnavailable(callback->onCameraUnavailable),

            mContext(callback->context) {}

camera/ndk/impl/ACaptureRequest.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
using namespace android;



struct ACameraOutputTarget {

    ACameraOutputTarget(ANativeWindow* window) : mWindow(window) {};

    explicit ACameraOutputTarget(ANativeWindow* window) : mWindow(window) {};



    bool operator == (const ACameraOutputTarget& other) const {

        return mWindow == other.mWindow;

include/camera/Camera.h

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public: 
    class RecordingProxy : public BnCameraRecordingProxy

    {

    public:

        RecordingProxy(const sp<Camera>& camera);

        explicit RecordingProxy(const sp<Camera>& camera);



        // ICameraRecordingProxy interface

        virtual status_t startRecording(const sp<ICameraRecordingProxyListener>& listener);
@@ -183,7 +183,7 @@ public: 
    };



protected:

                        Camera(int cameraId);

    explicit            Camera(int cameraId);

                        Camera(const Camera&);

                        Camera& operator=(const Camera);