From cb7910ec3fe6c72f201b99d4814ccc2285ec9ec3 Mon Sep 17 00:00:00 2001 From: Amy Zhang Date: Tue, 8 Dec 2020 13:30:55 -0800 Subject: [PATCH] Rename configureMonitorEvent to setMonitorEventMask Change-Id: I7a215176989f2f244dec81fe44ed985e690c206e Test: atest TunerTest Bug: 175130122 --- core/api/system-current.txt | 2 +- .../java/android/media/tv/tuner/filter/Filter.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 66d29d375a7c1..2aa75aed444b8 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -5285,12 +5285,12 @@ package android.media.tv.tuner.filter { public class Filter implements java.lang.AutoCloseable { method public void close(); method public int configure(@NonNull android.media.tv.tuner.filter.FilterConfiguration); - method public int configureMonitorEvent(int); method public int flush(); method public int getId(); method public long getId64Bit(); method public int read(@NonNull byte[], long, long); method public int setDataSource(@Nullable android.media.tv.tuner.filter.Filter); + method public int setMonitorEventMask(int); method public int start(); method public int stop(); field public static final int MONITOR_EVENT_IP_CID_CHANGE = 2; // 0x2 diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java index 96371e505a771..9f327c93f63b3 100644 --- a/media/java/android/media/tv/tuner/filter/Filter.java +++ b/media/java/android/media/tv/tuner/filter/Filter.java @@ -209,7 +209,7 @@ public class Filter implements AutoCloseable { prefix = "MONITOR_EVENT_", value = {MONITOR_EVENT_SCRAMBLING_STATUS, MONITOR_EVENT_IP_CID_CHANGE}) @Retention(RetentionPolicy.SOURCE) - public @interface MonitorEventTypeMask {} + public @interface MonitorEventMask {} /** * Monitor scrambling status change. @@ -239,7 +239,7 @@ public class Filter implements AutoCloseable { int type, int subType, FilterConfiguration settings); private native int nativeGetId(); private native long nativeGetId64Bit(); - private native int nativeConfigureMonitorEvent(int monitorEventTypesMask); + private native int nativeConfigureMonitorEvent(int monitorEventMask); private native int nativeSetDataSource(Filter source); private native int nativeStartFilter(); private native int nativeStopFilter(); @@ -344,19 +344,19 @@ public class Filter implements AutoCloseable { * will cause no-op. Use {@link TunerVersionChecker#getTunerVersion()} to get the version * information. * - * @param monitorEventTypesMask Types of event to be monitored. Set corresponding bit to - * monitor it. Reset to stop monitoring. + * @param monitorEventMask Types of event to be monitored. Set corresponding bit to + * monitor it. Reset to stop monitoring. * @return result status of the operation. */ @Result - public int configureMonitorEvent(@MonitorEventTypeMask int monitorEventTypesMask) { + public int setMonitorEventMask(@MonitorEventMask int monitorEventMask) { synchronized (mLock) { TunerUtils.checkResourceState(TAG, mIsClosed); if (!TunerVersionChecker.checkHigherOrEqualVersionTo( - TunerVersionChecker.TUNER_VERSION_1_1, "configureMonitorEvent")) { + TunerVersionChecker.TUNER_VERSION_1_1, "setMonitorEventMask")) { return Tuner.RESULT_UNAVAILABLE; } - return nativeConfigureMonitorEvent(monitorEventTypesMask); + return nativeConfigureMonitorEvent(monitorEventMask); } }