Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 316fa0aee7

Change-Id: I43d1cc625834092f12adec5ff52d1565d1b91e23
This commit is contained in:
Chih-hung Hsieh
2016-09-01 17:56:12 +00:00
committed by android-build-merger
parent f1e8aed4cd 316fa0aee7
commit 650615fb17
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/input/SpriteController.h
View File

@@ -214,7 +214,7 @@ private:
virtual ~SpriteImpl(); virtual ~SpriteImpl();
public: public:
SpriteImpl(const sp<SpriteController> controller); explicit SpriteImpl(const sp<SpriteController> controller);
virtual void setIcon(const SpriteIcon& icon); virtual void setIcon(const SpriteIcon& icon);
virtual void setVisible(bool visible); virtual void setVisible(bool visible);

2
services/core/jni/com_android_server_input_InputApplicationHandle.h
View File

@@ -26,7 +26,7 @@ namespace android {
class NativeInputApplicationHandle : public InputApplicationHandle { class NativeInputApplicationHandle : public InputApplicationHandle {
public: public:
NativeInputApplicationHandle(jweak objWeak); explicit NativeInputApplicationHandle(jweak objWeak);
virtual ~NativeInputApplicationHandle(); virtual ~NativeInputApplicationHandle();
jobject getInputApplicationHandleObjLocalRef(JNIEnv* env); jobject getInputApplicationHandleObjLocalRef(JNIEnv* env);