summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2016-08-29 14:51:31 -0700
committerChih-Hung Hsieh <chh@google.com>2016-08-29 14:51:31 -0700
commit6d09d547b06b86b337e8e16c2585b3882a5bb1dc (patch)
tree0c81514e6726b36c90433e9d25eeb861702615f9
parentc4c4a1e76e4de30a43c3396d3e0b55209666346d (diff)
Fix google-explicit-constructor warnings.
* Add explicit keyword to conversion constructors. Bug: 28341362 Test: build with WITH_TIDY=1 Change-Id: Ic550902559b0800bdcfc0b1d301313a909434eed
-rw-r--r--libs/input/SpriteController.h2
-rw-r--r--services/core/jni/com_android_server_input_InputApplicationHandle.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h
index 905833c7877d..7fc8d6fd5197 100644
--- a/libs/input/SpriteController.h
+++ b/libs/input/SpriteController.h
@@ -214,7 +214,7 @@ private:
virtual ~SpriteImpl();
public:
- SpriteImpl(const sp<SpriteController> controller);
+ explicit SpriteImpl(const sp<SpriteController> controller);
virtual void setIcon(const SpriteIcon& icon);
virtual void setVisible(bool visible);
diff --git a/services/core/jni/com_android_server_input_InputApplicationHandle.h b/services/core/jni/com_android_server_input_InputApplicationHandle.h
index 62c85704f61d..e6f25cce1f98 100644
--- a/services/core/jni/com_android_server_input_InputApplicationHandle.h
+++ b/services/core/jni/com_android_server_input_InputApplicationHandle.h
@@ -26,7 +26,7 @@ namespace android {
class NativeInputApplicationHandle : public InputApplicationHandle {
public:
- NativeInputApplicationHandle(jweak objWeak);
+ explicit NativeInputApplicationHandle(jweak objWeak);
virtual ~NativeInputApplicationHandle();
jobject getInputApplicationHandleObjLocalRef(JNIEnv* env);