Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d97f6d38 authored by Ray Chin's avatar Ray Chin
Browse files

Add tuner version 4.0 constant

Flag: android.media.tv.flags.tuner_w_apis
Bug: 320419647
Test: atest android.media.tv.tuner.cts.TunerTest on cf_x86_tv
Change-Id: I71492f05b39d3fabd3629d417fe45a41b3e45bc5
parent 0673f3f7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 {
+1 −1
Original line number Diff line number Diff line
@@ -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",
+1 −0
Original line number Diff line number Diff line
@@ -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
  }
+9 −1
Original line number Diff line number Diff line
@@ -40,3 +40,11 @@ flag {
    description: "Performance and Storage Optimization in Google TV Kids Mode."
    bug: "288383796"
}

flag {
    name: "tuner_w_apis"
    is_exported: true
    namespace: "media_tv"
    description: "Tuner V4.0 APIs for Android W"
    bug: "320419647"
}
+8 −1
Original line number Diff line number Diff line
@@ -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.
Loading