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

Commit e20c9a3a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use ScopedLocalRef instead of env->DeleteLocalRef" into udc-dev am:... 

Merge "Use ScopedLocalRef instead of env->DeleteLocalRef" into udc-dev am: 2d4cc167 am: 4176ea5d am: 32217700

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23160484



Change-Id: I84efaf02232833a66e931e162407d3d021543de9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5717acbb 32217700

media/jni/android_media_tv_Tuner.cpp

+350 −397

File changed.

Preview size limit exceeded, changes collapsed.

media/jni/android_media_tv_Tuner.h

+13 −11
Original line number Diff line number Diff line
@@ -163,17 +163,19 @@ private: 
    jmethodID mRestartEventInitID;

    jfieldID mMediaEventFieldContextID;

    bool mSharedFilter;

    void getSectionEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getMediaEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getPesEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getTsRecordEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getMmtpRecordEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getDownloadEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getIpPayloadEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getTemiEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getScramblingStatusEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getIpCidChangeEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getRestartEvent(jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getSectionEvent(const jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getMediaEvent(const jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getPesEvent(const jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getTsRecordEvent(const jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getMmtpRecordEvent(const jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getDownloadEvent(const jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getIpPayloadEvent(const jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getTemiEvent(const jobjectArray& arr, const int size, const DemuxFilterEvent& event);

    void getScramblingStatusEvent(const jobjectArray& arr, const int size,

                                  const DemuxFilterEvent& event);

    void getIpCidChangeEvent(const jobjectArray& arr, const int size,

                             const DemuxFilterEvent& event);

    void getRestartEvent(const jobjectArray& arr, const int size, const DemuxFilterEvent& event);

};



struct JTuner;