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

Commit 12fbb578 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress services/core google-explicit-constructor warnings" am:... 

Merge "Fix/suppress services/core google-explicit-constructor warnings" am: ffb51ba0 am: 14756c26
am: fa49fae6

Change-Id: Ie08eba549292e324d87b72cffea6cecaf67940ef
parents 24fd0a9f fa49fae6

services/core/jni/BroadcastRadio/NativeCallbackThread.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class NativeCallbackThread { 
    DISALLOW_COPY_AND_ASSIGN(NativeCallbackThread);



public:

    NativeCallbackThread(JavaVM *vm);

    explicit NativeCallbackThread(JavaVM *vm);

    virtual ~NativeCallbackThread();



    void enqueue(const Task &task);

services/core/jni/BroadcastRadio/Tuner.cpp

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ class HalDeathRecipient : public hidl_death_recipient { 
    wp<V1_1::ITunerCallback> mTunerCallback;



public:

    HalDeathRecipient(wp<V1_1::ITunerCallback> tunerCallback):mTunerCallback(tunerCallback) {}

    explicit HalDeathRecipient(wp<V1_1::ITunerCallback> tunerCallback)

        : mTunerCallback(tunerCallback) {}



    virtual void serviceDied(uint64_t cookie, const wp<hidl::base::V1_0::IBase>& who);

};

services/core/jni/com_android_server_hdmi_HdmiCecController.cpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public: 
private:

    class HdmiCecCallback : public IHdmiCecCallback {

    public:

        HdmiCecCallback(HdmiCecController* controller) : mController(controller) {};

        explicit HdmiCecCallback(HdmiCecController* controller) : mController(controller) {};

        Return<void> onCecMessage(const CecMessage& event)  override;

        Return<void> onHotplugEvent(const HotplugEvent& event)  override;

    private:

services/core/jni/com_android_server_storage_AppFuseBridge.cpp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public: 
        }

    }



    operator bool() {

    explicit operator bool() {

        return mLocked;

    }

services/core/jni/com_android_server_tv_TvInputHal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ private: 


    class TvInputCallback : public ITvInputCallback {

    public:

        TvInputCallback(JTvInputHal* hal);

        explicit TvInputCallback(JTvInputHal* hal);

        Return<void> notify(const TvInputEvent& event) override;

    private:

        JTvInputHal* mHal;