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

Merge "Filter changes according to API review" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-06 04:42:22 +00:00
committed by Android (Google) Code Review
parent 24cfad9c2c be1c41196f
commit 22d090cb4c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -5077,6 +5077,7 @@ package android.media.tv.tuner.filter {
field public static final int TYPE_MMTP = 2; // 0x2 field public static final int TYPE_MMTP = 2; // 0x2
field public static final int TYPE_TLV = 8; // 0x8 field public static final int TYPE_TLV = 8; // 0x8
field public static final int TYPE_TS = 1; // 0x1 field public static final int TYPE_TS = 1; // 0x1
field public static final int TYPE_UNDEFINED = 0; // 0x0
} }
public interface FilterCallback { public interface FilterCallback {

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

@@ -44,6 +44,10 @@ public class Filter implements AutoCloseable {
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface Type {} public @interface Type {}
/**
* Undefined filter type.
*/
public static final int TYPE_UNDEFINED = 0;
/** /**
* TS filter type. * TS filter type.
*/ */
@@ -248,7 +252,6 @@ public class Filter implements AutoCloseable {
/** /**
* Gets the filter Id. * Gets the filter Id.
*/ */
@Result
public int getId() { public int getId() {
return nativeGetId(); return nativeGetId();
} }
@@ -273,6 +276,8 @@ public class Filter implements AutoCloseable {
/** /**
* Starts filtering data. * Starts filtering data.
* *
* <p>Does nothing if the filter is already started.
*
* @return result status of the operation. * @return result status of the operation.
*/ */
@Result @Result
@@ -284,6 +289,8 @@ public class Filter implements AutoCloseable {
/** /**
* Stops filtering data. * Stops filtering data.
* *
* <p>Does nothing if the filter is stopped or not started.
*
* @return result status of the operation. * @return result status of the operation.
*/ */
@Result @Result
@@ -312,14 +319,13 @@ public class Filter implements AutoCloseable {
* @param size the maximum number of bytes to read. * @param size the maximum number of bytes to read.
* @return the number of bytes read. * @return the number of bytes read.
*/ */
@Result
public int read(@NonNull byte[] buffer, @BytesLong long offset, @BytesLong long size) { public int read(@NonNull byte[] buffer, @BytesLong long offset, @BytesLong long size) {
size = Math.min(size, buffer.length - offset); size = Math.min(size, buffer.length - offset);
return nativeRead(buffer, offset, size); return nativeRead(buffer, offset, size);
} }
/** /**
* Releases the Filter instance. * Stops filtering data and releases the Filter instance.
*/ */
@Override @Override
public void close() { public void close() {