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

Merge "Deprecate DvrPlayback.attach/detachFilter() and DvbcFrontendSettings#SpectralInversion"

Browse Source
This commit is contained in:
Amy Zhang
2020-10-15 15:06:40 +00:00
committed by Android (Google) Code Review
parent 1ca02694d0 27bab9b66f
commit f9d3b34070
4 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/system-current.txt
View File

@@ -5111,10 +5111,10 @@ package android.media.tv.tuner {
package android.media.tv.tuner.dvr {
public class DvrPlayback implements java.lang.AutoCloseable {
method public int attachFilter(@NonNull android.media.tv.tuner.filter.Filter);
method @Deprecated public int attachFilter(@NonNull android.media.tv.tuner.filter.Filter);
method public void close();
method public int configure(@NonNull android.media.tv.tuner.dvr.DvrSettings);
method public int detachFilter(@NonNull android.media.tv.tuner.filter.Filter);
method @Deprecated public int detachFilter(@NonNull android.media.tv.tuner.filter.Filter);
method public int flush();
method public long read(long);
method public long read(@NonNull byte[], long, long);
@@ -5708,9 +5708,9 @@ package android.media.tv.tuner.frontend {
field public static final int OUTER_FEC_OUTER_FEC_NONE = 1; // 0x1
field public static final int OUTER_FEC_OUTER_FEC_RS = 2; // 0x2
field public static final int OUTER_FEC_UNDEFINED = 0; // 0x0
field public static final int SPECTRAL_INVERSION_INVERTED = 2; // 0x2
field public static final int SPECTRAL_INVERSION_NORMAL = 1; // 0x1
field public static final int SPECTRAL_INVERSION_UNDEFINED = 0; // 0x0
field @Deprecated public static final int SPECTRAL_INVERSION_INVERTED = 2; // 0x2
field @Deprecated public static final int SPECTRAL_INVERSION_NORMAL = 1; // 0x1
field @Deprecated public static final int SPECTRAL_INVERSION_UNDEFINED = 0; // 0x0
field public static final int TIME_INTERLEAVE_MODE_128_1_0 = 2; // 0x2
field public static final int TIME_INTERLEAVE_MODE_128_1_1 = 4; // 0x4
field public static final int TIME_INTERLEAVE_MODE_128_2 = 128; // 0x80

10
media/java/android/media/tv/tuner/dvr/DvrPlayback.java
View File

@@ -123,13 +123,14 @@ public class DvrPlayback implements AutoCloseable {
/**
* Attaches a filter to DVR interface for playback.
*
* <p>This method will be deprecated. Now it's a no-op.
* <p>Filters opened by {@link Tuner#openFilter} are used for DVR playback.
* @deprecated attaching filters is not valid in Dvr Playback use case. This API is a no-op.
* Filters opened by {@link Tuner#openFilter} are used for DVR playback.
*
* @param filter the filter to be attached.
* @return result status of the operation.
*/
@Result
@Deprecated
public int attachFilter(@NonNull Filter filter) {
// no-op
return Tuner.RESULT_UNAVAILABLE;
@@ -138,13 +139,14 @@ public class DvrPlayback implements AutoCloseable {
/**
* Detaches a filter from DVR interface.
*
* <p>This method will be deprecated. Now it's a no-op.
* <p>Filters opened by {@link Tuner#openFilter} are used for DVR playback.
* @deprecated detaching filters is not valid in Dvr Playback use case. This API is a no-op.
* Filters opened by {@link Tuner#openFilter} are used for DVR playback.
*
* @param filter the filter to be detached.
* @return result status of the operation.
*/
@Result
@Deprecated
public int detachFilter(@NonNull Filter filter) {
// no-op
return Tuner.RESULT_UNAVAILABLE;

15
media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java
View File

@@ -119,7 +119,11 @@ public class DvbcFrontendSettings extends FrontendSettings {
public static final int ANNEX_C = Constants.FrontendDvbcAnnex.C;
/** @hide */
/**
* @deprecated Use the {@link FrontendSettings#FrontendSpectralInversion} instead.
* @hide
*/
@Deprecated
@IntDef(prefix = "SPECTRAL_INVERSION_",
value = {SPECTRAL_INVERSION_UNDEFINED, SPECTRAL_INVERSION_NORMAL,
SPECTRAL_INVERSION_INVERTED})
@@ -128,17 +132,26 @@ public class DvbcFrontendSettings extends FrontendSettings {
/**
* Spectral Inversion Type undefined.
*
* @deprecated Use the {@link FrontendSettings#FRONTEND_SPECTRAL_INVERSION_UNDEFINED} instead.
*/
@Deprecated
public static final int SPECTRAL_INVERSION_UNDEFINED =
Constants.FrontendDvbcSpectralInversion.UNDEFINED;
/**
* Normal Spectral Inversion.
*
* @deprecated Use the {@link FrontendSettings#FRONTEND_SPECTRAL_INVERSION_NORMAL} instead.
*/
@Deprecated
public static final int SPECTRAL_INVERSION_NORMAL =
Constants.FrontendDvbcSpectralInversion.NORMAL;
/**
* Inverted Spectral Inversion.
*
* @deprecated Use the {@link FrontendSettings#FRONTEND_SPECTRAL_INVERSION_INVERTED} instead.
*/
@Deprecated
public static final int SPECTRAL_INVERSION_INVERTED =
Constants.FrontendDvbcSpectralInversion.INVERTED;

10
non-updatable-api/system-current.txt
View File

@@ -5051,10 +5051,10 @@ package android.media.tv.tuner {
package android.media.tv.tuner.dvr {
public class DvrPlayback implements java.lang.AutoCloseable {
method public int attachFilter(@NonNull android.media.tv.tuner.filter.Filter);
method @Deprecated public int attachFilter(@NonNull android.media.tv.tuner.filter.Filter);
method public void close();
method public int configure(@NonNull android.media.tv.tuner.dvr.DvrSettings);
method public int detachFilter(@NonNull android.media.tv.tuner.filter.Filter);
method @Deprecated public int detachFilter(@NonNull android.media.tv.tuner.filter.Filter);
method public int flush();
method public long read(long);
method public long read(@NonNull byte[], long, long);
@@ -5648,9 +5648,9 @@ package android.media.tv.tuner.frontend {
field public static final int OUTER_FEC_OUTER_FEC_NONE = 1; // 0x1
field public static final int OUTER_FEC_OUTER_FEC_RS = 2; // 0x2
field public static final int OUTER_FEC_UNDEFINED = 0; // 0x0
field public static final int SPECTRAL_INVERSION_INVERTED = 2; // 0x2
field public static final int SPECTRAL_INVERSION_NORMAL = 1; // 0x1
field public static final int SPECTRAL_INVERSION_UNDEFINED = 0; // 0x0
field @Deprecated public static final int SPECTRAL_INVERSION_INVERTED = 2; // 0x2
field @Deprecated public static final int SPECTRAL_INVERSION_NORMAL = 1; // 0x1
field @Deprecated public static final int SPECTRAL_INVERSION_UNDEFINED = 0; // 0x0
field public static final int TIME_INTERLEAVE_MODE_128_1_0 = 2; // 0x2
field public static final int TIME_INTERLEAVE_MODE_128_1_1 = 4; // 0x4
field public static final int TIME_INTERLEAVE_MODE_128_2 = 128; // 0x80