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

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

Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f 

am: 4836d079

Change-Id: Ib0369e46dd1f1e56b3f660e615bc34c87120acaa
parents ef1fb488 4836d079

media/mca/filterfw/native/core/gl_frame.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ class GLFrame : public GLBufferHandle { 
    // Create an empty GL frame in the specified GL environment. Note, that the GLFrame does NOT

    // take ownership. The caller must make sure the GLEnv stays valid as long as the GLFrame is

    // alive.

    GLFrame(GLEnv* gl_env);

    explicit GLFrame(GLEnv* gl_env);



    // Deallocate a GL frame.

    ~GLFrame();

media/mca/filterfw/native/core/native_frame.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ namespace filterfw { 
class NativeFrame {

  public:

    // Create an empty native frame.

    NativeFrame(int size);

    explicit NativeFrame(int size);



    ~NativeFrame();