Merge "Fix google-explicit-constructor warnings."

aosp-mirror · Sep 1, 2016 · a6b6252 · a6b6252
2 parents 47784a7 + 6d09d54
commit a6b6252
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h
@@ -214,7 +214,7 @@ class SpriteController : public MessageHandler {
         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
@@ -26,7 +26,7 @@ namespace android {
 
 class NativeInputApplicationHandle : public InputApplicationHandle {
 public:
-    NativeInputApplicationHandle(jweak objWeak);
+    explicit NativeInputApplicationHandle(jweak objWeak);
     virtual ~NativeInputApplicationHandle();
 
     jobject getInputApplicationHandleObjLocalRef(JNIEnv* env);