Merge "Fix/suppress services/core google-explicit-constructor warnings" am: ffb51ba0f0
am: 14756c26fa
Change-Id: Iecd917842dafbe1f07b25827730d7671fc7e22a3
This commit is contained in:
@@ -41,7 +41,7 @@ class NativeCallbackThread {
|
|||||||
DISALLOW_COPY_AND_ASSIGN(NativeCallbackThread);
|
DISALLOW_COPY_AND_ASSIGN(NativeCallbackThread);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
NativeCallbackThread(JavaVM *vm);
|
explicit NativeCallbackThread(JavaVM *vm);
|
||||||
virtual ~NativeCallbackThread();
|
virtual ~NativeCallbackThread();
|
||||||
|
|
||||||
void enqueue(const Task &task);
|
void enqueue(const Task &task);
|
||||||
|
|||||||
@@ -73,7 +73,8 @@ class HalDeathRecipient : public hidl_death_recipient {
|
|||||||
wp<V1_1::ITunerCallback> mTunerCallback;
|
wp<V1_1::ITunerCallback> mTunerCallback;
|
||||||
|
|
||||||
public:
|
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);
|
virtual void serviceDied(uint64_t cookie, const wp<hidl::base::V1_0::IBase>& who);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
class HdmiCecCallback : public IHdmiCecCallback {
|
class HdmiCecCallback : public IHdmiCecCallback {
|
||||||
public:
|
public:
|
||||||
HdmiCecCallback(HdmiCecController* controller) : mController(controller) {};
|
explicit HdmiCecCallback(HdmiCecController* controller) : mController(controller) {};
|
||||||
Return<void> onCecMessage(const CecMessage& event) override;
|
Return<void> onCecMessage(const CecMessage& event) override;
|
||||||
Return<void> onHotplugEvent(const HotplugEvent& event) override;
|
Return<void> onHotplugEvent(const HotplugEvent& event) override;
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
operator bool() {
|
explicit operator bool() {
|
||||||
return mLocked;
|
return mLocked;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -292,7 +292,7 @@ private:
|
|||||||
|
|
||||||
class TvInputCallback : public ITvInputCallback {
|
class TvInputCallback : public ITvInputCallback {
|
||||||
public:
|
public:
|
||||||
TvInputCallback(JTvInputHal* hal);
|
explicit TvInputCallback(JTvInputHal* hal);
|
||||||
Return<void> notify(const TvInputEvent& event) override;
|
Return<void> notify(const TvInputEvent& event) override;
|
||||||
private:
|
private:
|
||||||
JTvInputHal* mHal;
|
JTvInputHal* mHal;
|
||||||
|
|||||||
Reference in New Issue
Block a user