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

Commit 0555e7b7 authored by Yixiao Luo's avatar Yixiao Luo Committed by Android (Google) Code Review
Browse files

Merge "Move feature flag update_client_profile_priority to media_tv namespace" into main

parents 9dfec10b f6bc0fe2

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7619,7 +7619,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 {

























media/java/android/media/MediaCas.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -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) {

































media/java/android/media/flags/media_better_together.aconfig



+0
−7




























Original line number
Diff line number
Diff line








@@ -77,13 +77,6 @@ flag {













    bug: "314324170"















}





























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

































media/java/android/media/tv/flags/media_tv.aconfig



+9
−1




























Original line number
Diff line number
Diff line








@@ -81,6 +81,14 @@ flag {













    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