From 27bab9b66fa2da7a5f10aa6aae48499e199abd7b Mon Sep 17 00:00:00 2001 From: Amy Zhang Date: Fri, 14 Aug 2020 17:12:30 -0700 Subject: [PATCH] Deprecate DvrPlayback.attach/detachFilter() and DvbcFrontendSettings#SpectralInversion DvrPlayback.attach/detachFilter() are not valid for Dvr playback. They are no-op now. DvbcFrontendSettings#SpectralInversion is replaced with FrontendSettings#FrontendSpectralInversion since the spectral setting is a general FrontendSettings in Tuner 1.1. Test: make Bug: b/155435894 Bug: b/158818695 Change-Id: I77f81a4b6d3dca1ad30e50cac6bb721888f71a60 --- api/system-current.txt | 10 +++++----- .../android/media/tv/tuner/dvr/DvrPlayback.java | 10 ++++++---- .../tv/tuner/frontend/DvbcFrontendSettings.java | 15 ++++++++++++++- non-updatable-api/system-current.txt | 10 +++++----- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index d2b6af8ec9140..ca2c76bcfb6bd 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5089,10 +5089,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); @@ -5683,9 +5683,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 diff --git a/media/java/android/media/tv/tuner/dvr/DvrPlayback.java b/media/java/android/media/tv/tuner/dvr/DvrPlayback.java index bb00bb3b8d566..597278b0ea3eb 100644 --- a/media/java/android/media/tv/tuner/dvr/DvrPlayback.java +++ b/media/java/android/media/tv/tuner/dvr/DvrPlayback.java @@ -123,13 +123,14 @@ public class DvrPlayback implements AutoCloseable { /** * Attaches a filter to DVR interface for playback. * - *

This method will be deprecated. Now it's a no-op. - *

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. * - *

This method will be deprecated. Now it's a no-op. - *

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; diff --git a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java index 673268621d933..e6968bb4ec902 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java @@ -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; diff --git a/non-updatable-api/system-current.txt b/non-updatable-api/system-current.txt index fc6ff746a8cb5..445dabbed86e4 100644 --- a/non-updatable-api/system-current.txt +++ b/non-updatable-api/system-current.txt @@ -5029,10 +5029,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); @@ -5623,9 +5623,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