commit 650615fb171f2eb31f5b3e893b2df3e378ad2b81
author Chih-hung Hsieh <chh@google.com> Thu Sep 01 17:56:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 01 17:56:12 2016 +0000
tree 51949fad3c6900391389a67ab9940e9e6a53860a
parent f1e8aed4cd242352bc8507406bf52d3125e25cde
parent 316fa0aee757f6dd0001943e2d4683a40ec8a149

Merge "Fix google-explicit-constructor warnings." am: a6b6252d8b am: 1676161c1d
am: 316fa0aee7

Change-Id: I43d1cc625834092f12adec5ff52d1565d1b91e23

libs/input/SpriteController.h

diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h
index 905833c..7fc8d6f 100644
--- a/libs/input/SpriteController.h
+++ b/libs/input/SpriteController.h
@@ -214,7 +214,7 @@
         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);

services/core/jni/com_android_server_input_InputApplicationHandle.h

diff --git a/services/core/jni/com_android_server_input_InputApplicationHandle.h b/services/core/jni/com_android_server_input_InputApplicationHandle.h
index 62c8570..e6f25cc 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 @@
 
 class NativeInputApplicationHandle : public InputApplicationHandle {
 public:
-    NativeInputApplicationHandle(jweak objWeak);
+    explicit NativeInputApplicationHandle(jweak objWeak);
     virtual ~NativeInputApplicationHandle();
 
     jobject getInputApplicationHandleObjLocalRef(JNIEnv* env);