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

Commit 0cad7233 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge branch 'master' of git://android.git.kernel.org/platform/frameworks/base

parents caee1703 9f1455fc

include/media/PVPlayer.h

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ private: 
    char *                      mDataSourcePath;

    bool                        mIsDataSourceSet;

    sp<ISurface>                mSurface;

    int                         mSharedFd;

    void *                      mMemBase;

    off_t                       mMemSize;

    status_t                    mInit;

    int                         mDuration;