Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename configureMonitorEvent to setMonitorEventMask"

Browse Source
This commit is contained in:
Amy Zhang
2021-01-28 03:47:08 +00:00
committed by Android (Google) Code Review
parent 458fcd8872 cb7910ec3f
commit 4eed2b6bf9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -5606,12 +5606,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

14
media/java/android/media/tv/tuner/filter/Filter.java
View File

@@ -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);
}
}