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

Merge "Fix google-explicit-constructor warnings in soundpool."

Browse Source 
am: feee33ce2c

Change-Id: Id3cf418900b7eb3ac2e3d94f674f4ed6f624ba27
This commit is contained in:
Chih-hung Hsieh
2016-08-30 22:29:05 +00:00
committed by android-build-merger
parent ed4b31f9e1 feee33ce2c
commit 17f1fc6c76
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/jni/soundpool/SoundPool.h
View File

@@ -37,7 +37,7 @@ class SoundPool;
// for queued events // for queued events
class SoundPoolEvent { class SoundPoolEvent {
public: public:
SoundPoolEvent(int msg, int arg1=0, int arg2=0) : explicit SoundPoolEvent(int msg, int arg1=0, int arg2=0) :
mMsg(msg), mArg1(arg1), mArg2(arg2) {} mMsg(msg), mArg1(arg1), mArg2(arg2) {}
int mMsg; int mMsg;
int mArg1; int mArg1;

2
media/jni/soundpool/SoundPoolThread.h
View File

@@ -40,7 +40,7 @@ public:
*/ */
class SoundPoolThread { class SoundPoolThread {
public: public:
SoundPoolThread(SoundPool* SoundPool); explicit SoundPoolThread(SoundPool* SoundPool);
~SoundPoolThread(); ~SoundPoolThread();
void loadSample(int sampleID); void loadSample(int sampleID);
void quit(); void quit();