Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17f1fc6c authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

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

am: feee33ce

Change-Id: Id3cf418900b7eb3ac2e3d94f674f4ed6f624ba27
parents ed4b31f9 feee33ce

media/jni/soundpool/SoundPool.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class SoundPool; 
// for queued events

class SoundPoolEvent {

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) {}

    int         mMsg;

    int         mArg1;

media/jni/soundpool/SoundPoolThread.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public: 
 */

class SoundPoolThread {

public:

    SoundPoolThread(SoundPool* SoundPool);

    explicit SoundPoolThread(SoundPool* SoundPool);

    ~SoundPoolThread();

    void loadSample(int sampleID);

    void quit();