diff options
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaCas.java | 5 | ||||
| -rw-r--r-- | media/java/android/media/flags/media_better_together.aconfig | 7 | ||||
| -rw-r--r-- | media/java/android/media/tv/flags/media_tv.aconfig | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index ed95fdd52f45..eef3b591db4e 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -7618,7 +7618,7 @@ package android.media { public final class MediaCas implements java.lang.AutoCloseable { method @FlaggedApi("android.media.tv.flags.set_resource_holder_retain") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void setResourceHolderRetain(boolean); - method @FlaggedApi("com.android.media.flags.update_client_profile_priority") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public boolean updateResourcePriority(int, int); + method @FlaggedApi("android.media.tv.flags.mediacas_update_client_profile_priority") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public boolean updateResourcePriority(int, int); } public final class MediaCodec { diff --git a/media/java/android/media/MediaCas.java b/media/java/android/media/MediaCas.java index 3f9126aa9456..1ecba31ce07f 100644 --- a/media/java/android/media/MediaCas.java +++ b/media/java/android/media/MediaCas.java @@ -16,10 +16,9 @@ package android.media; +import static android.media.tv.flags.Flags.FLAG_MEDIACAS_UPDATE_CLIENT_PROFILE_PRIORITY; import static android.media.tv.flags.Flags.FLAG_SET_RESOURCE_HOLDER_RETAIN; -import static com.android.media.flags.Flags.FLAG_UPDATE_CLIENT_PROFILE_PRIORITY; - import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; @@ -996,7 +995,7 @@ public final class MediaCas implements AutoCloseable { * @param niceValue the nice value. * @hide */ - @FlaggedApi(FLAG_UPDATE_CLIENT_PROFILE_PRIORITY) + @FlaggedApi(FLAG_MEDIACAS_UPDATE_CLIENT_PROFILE_PRIORITY) @SystemApi @RequiresPermission(android.Manifest.permission.TUNER_RESOURCE_ACCESS) public boolean updateResourcePriority(int priority, int niceValue) { diff --git a/media/java/android/media/flags/media_better_together.aconfig b/media/java/android/media/flags/media_better_together.aconfig index 7895eb27b372..5b1ea8b81c80 100644 --- a/media/java/android/media/flags/media_better_together.aconfig +++ b/media/java/android/media/flags/media_better_together.aconfig @@ -78,13 +78,6 @@ flag { } flag { - name: "update_client_profile_priority" - namespace: "media_solutions" - description : "Feature flag to add updateResourcePriority api to MediaCas" - bug: "300565729" -} - -flag { name: "enable_built_in_speaker_route_suitability_statuses" is_exported: true namespace: "media_solutions" diff --git a/media/java/android/media/tv/flags/media_tv.aconfig b/media/java/android/media/tv/flags/media_tv.aconfig index 64416525441b..3dd6a95043ce 100644 --- a/media/java/android/media/tv/flags/media_tv.aconfig +++ b/media/java/android/media/tv/flags/media_tv.aconfig @@ -77,11 +77,19 @@ flag { name: "set_resource_holder_retain" is_exported: true namespace: "media_tv" - description : "Feature flag to add setResourceHolderRetain api to MediaCas and Tuner JAVA." + description: "Feature flag to add setResourceHolderRetain api to MediaCas and Tuner JAVA." bug: "372973197" } flag { + name: "mediacas_update_client_profile_priority" + is_exported: true + namespace: "media_tv" + description: "Feature flag to add updateResourcePriority api to MediaCas" + bug: "372971241" +} + +flag { name: "apply_picture_profiles" is_exported: true namespace: "media_tv" |