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

Commit b63749b0 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce am: 17f1fc6c am: c80db139" into nyc-mr1-dev-plus-aosp
parents e08b704c cb98cac6
Loading
Loading
Loading
Loading
+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;
+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();