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

Commit bc26339b authored by Alexander Roederer's avatar Alexander Roederer Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b308164892-FlagGuardTvExtender" into main 

* changes:
  Flag-guard android.app.Notification.TvExtender
  Adds aconfig flag to guard Notification.TvExtender
parents 688d9e58 df1324f6

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6727,7 +6727,7 @@ package android.app { 
    field protected android.app.Notification.Builder mBuilder;

  }













  public static final class Notification.TvExtender implements android.app.Notification.Extender {













  @FlaggedApi("android.app.api_tvextender") public static final class Notification.TvExtender implements android.app.Notification.Extender {















    ctor public Notification.TvExtender();















    ctor public Notification.TvExtender(@NonNull android.app.Notification);















    method @NonNull public android.app.Notification.Builder extend(@NonNull android.app.Notification.Builder);

























core/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -981,7 +981,7 @@ package android.app {













    field public static final int SEMANTIC_ACTION_MARK_CONVERSATION_AS_PRIORITY = 11; // 0xb















  }



























  public static final class Notification.TvExtender implements android.app.Notification.Extender {













  @FlaggedApi("android.app.api_tvextender") public static final class Notification.TvExtender implements android.app.Notification.Extender {















    method public boolean getSuppressShowOverApps();















    method public android.app.Notification.TvExtender setChannel(String);















  }

























core/api/system-removed.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -15,7 +15,7 @@ package android.app {













    method public static Class<? extends android.app.Notification.Style> getNotificationStyleClass(String);















  }





























  public static final class Notification.TvExtender implements android.app.Notification.Extender {













  @FlaggedApi("android.app.api_tvextender") public static final class Notification.TvExtender implements android.app.Notification.Extender {















    method @Deprecated public String getChannel();















  }

















































core/java/android/app/Notification.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -31,6 +31,7 @@ import android.annotation.ColorRes;













import android.annotation.DimenRes;















import android.annotation.Dimension;















import android.annotation.DrawableRes;













import android.annotation.FlaggedApi;















import android.annotation.IdRes;















import android.annotation.IntDef;















import android.annotation.NonNull;










@@ -12242,6 +12243,7 @@ public class Notification implements Parcelable













     * {@code TvExtender(Notification)} constructor, and then using the {@code get} methods















     * to access values.















     */













    @FlaggedApi(Flags.FLAG_API_TVEXTENDER)















    public static final class TvExtender implements Extender {















        private static final String TAG = "TvExtender";















































core/java/android/app/notification.aconfig



+10
−1




























Original line number
Diff line number
Diff line








@@ -6,3 +6,12 @@ flag {













  description: "This flag controls new and updated DND apis"















  bug: "300477976"















}



























flag {













  name: "api_tvextender"













  namespace: "systemui"













  description: "Guards new android.app.Notification.TvExtender api"













  bug: "308164892"













  is_fixed_read_only: true













}