diff options
| -rw-r--r-- | AconfigFlags.bp | 2 | ||||
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/tv/flags/media_tv.aconfig | 10 | ||||
| -rw-r--r-- | media/java/android/media/tv/tuner/TunerVersionChecker.java | 9 | ||||
| -rw-r--r-- | media/jni/Android.bp | 4 |
6 files changed, 22 insertions, 6 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 59a7cbc16587..b4127c5660f7 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -691,7 +691,7 @@ aconfig_declarations { exportable: true, package: "android.media.tv.flags", container: "system", - srcs: ["media/java/android/media/tv/flags/media_tv.aconfig"], + srcs: ["media/java/android/media/tv/flags/*.aconfig"], } java_aconfig_library { diff --git a/Android.bp b/Android.bp index af205d8f0646..f8907f3d82e8 100644 --- a/Android.bp +++ b/Android.bp @@ -109,7 +109,7 @@ filegroup { ":android.hardware.security.keymint-V3-java-source", ":android.hardware.security.secureclock-V1-java-source", ":android.hardware.thermal-V2-java-source", - ":android.hardware.tv.tuner-V2-java-source", + ":android.hardware.tv.tuner-V3-java-source", ":android.security.apc-java-source", ":android.security.authorization-java-source", ":android.security.legacykeystore-java-source", diff --git a/core/api/system-current.txt b/core/api/system-current.txt index fe792bc3a10b..df01aa847450 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -8140,6 +8140,7 @@ package android.media.tv.tuner { field public static final int TUNER_VERSION_1_1 = 65537; // 0x10001 field public static final int TUNER_VERSION_2_0 = 131072; // 0x20000 field public static final int TUNER_VERSION_3_0 = 196608; // 0x30000 + field @FlaggedApi("android.media.tv.flags.tuner_w_apis") public static final int TUNER_VERSION_4_0 = 262144; // 0x40000 field public static final int TUNER_VERSION_UNKNOWN = 0; // 0x0 } diff --git a/media/java/android/media/tv/flags/media_tv.aconfig b/media/java/android/media/tv/flags/media_tv.aconfig index d6e9e4e4c355..0829a90eac18 100644 --- a/media/java/android/media/tv/flags/media_tv.aconfig +++ b/media/java/android/media/tv/flags/media_tv.aconfig @@ -39,4 +39,12 @@ flag { namespace: "media_tv" description: "Performance and Storage Optimization in Google TV Kids Mode." bug: "288383796" -}
\ No newline at end of file +} + +flag { + name: "tuner_w_apis" + is_exported: true + namespace: "media_tv" + description: "Tuner V4.0 APIs for Android W" + bug: "320419647" +} diff --git a/media/java/android/media/tv/tuner/TunerVersionChecker.java b/media/java/android/media/tv/tuner/TunerVersionChecker.java index f29a93cbb228..a7c04155baf6 100644 --- a/media/java/android/media/tv/tuner/TunerVersionChecker.java +++ b/media/java/android/media/tv/tuner/TunerVersionChecker.java @@ -16,9 +16,11 @@ package android.media.tv.tuner; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.SystemApi; import android.annotation.TestApi; +import android.media.tv.flags.Flags; import android.util.Log; import java.lang.annotation.Retention; @@ -40,7 +42,7 @@ public final class TunerVersionChecker { /** @hide */ @IntDef(prefix = "TUNER_VERSION_", value = {TUNER_VERSION_UNKNOWN, TUNER_VERSION_1_0, TUNER_VERSION_1_1, - TUNER_VERSION_2_0}) + TUNER_VERSION_2_0, TUNER_VERSION_3_0, TUNER_VERSION_4_0}) @Retention(RetentionPolicy.SOURCE) public @interface TunerVersion {} /** @@ -63,6 +65,11 @@ public final class TunerVersionChecker { * Tuner version 3.0. */ public static final int TUNER_VERSION_3_0 = (3 << 16); + /** + * Tuner version 4.0. + */ + @FlaggedApi(Flags.FLAG_TUNER_W_APIS) + public static final int TUNER_VERSION_4_0 = (4 << 16); /** * Get the current running Tuner version. diff --git a/media/jni/Android.bp b/media/jni/Android.bp index 7f487e51f7e8..c44e26f17b5e 100644 --- a/media/jni/Android.bp +++ b/media/jni/Android.bp @@ -92,7 +92,7 @@ cc_library_shared { "android.hidl.memory@1.0", "android.hidl.token@1.0-utils", "android.hardware.drm-V1-ndk", - "android.hardware.tv.tuner-V2-ndk", + "android.hardware.tv.tuner-V3-ndk", ], header_libs: [ @@ -180,7 +180,7 @@ cc_library_shared { shared_libs: [ "android.hardware.graphics.bufferqueue@2.0", - "android.hardware.tv.tuner-V2-ndk", + "android.hardware.tv.tuner-V3-ndk", "libbinder_ndk", "libandroid_runtime", "libcutils", |