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

Commit 787314ed authored by Matías Hernández's avatar Matías Hernández
Browse files

Inline MODES_API flag 

Mostly mechanical changes, except:
* Fixed bug in updateZenRulesOnLocaleChange() - was checking wrong field for FIELD_NAME flag.
* Renamed areChannelsBypassingDnd to hasPriorityChannels, except when it's the "real" areChannelsBypassingDnd, i.e. hasPriorityChannels && allowPriorityChannels.
* Deleted or inlined a handful of methods.

Bug: 310620812
Test: Preexisting + ZenModeHelperTest
Flag: EXEMPT Inlining flag
Change-Id: Icdb8f7abe80b87e468372cfbfe6e51a0dadba3a2
parent 81c1aef9

core/api/current.txt

+37 −37
Original line number Diff line number Diff line
@@ -5478,37 +5478,37 @@ package android.app { 
    method public android.net.Uri getConditionId();

    method @Nullable public android.content.ComponentName getConfigurationActivity();

    method public long getCreationTime();

    method @FlaggedApi("android.app.modes_api") @Nullable public android.service.notification.ZenDeviceEffects getDeviceEffects();

    method @FlaggedApi("android.app.modes_api") @DrawableRes public int getIconResId();

    method @Nullable public android.service.notification.ZenDeviceEffects getDeviceEffects();

    method @DrawableRes public int getIconResId();

    method public int getInterruptionFilter();

    method public String getName();

    method public android.content.ComponentName getOwner();

    method @FlaggedApi("android.app.modes_api") @Nullable public String getTriggerDescription();

    method @FlaggedApi("android.app.modes_api") public int getType();

    method @Nullable public String getTriggerDescription();

    method public int getType();

    method @Nullable public android.service.notification.ZenPolicy getZenPolicy();

    method public boolean isEnabled();

    method @FlaggedApi("android.app.modes_api") public boolean isManualInvocationAllowed();

    method public boolean isManualInvocationAllowed();

    method public void setConditionId(android.net.Uri);

    method public void setConfigurationActivity(@Nullable android.content.ComponentName);

    method @FlaggedApi("android.app.modes_api") public void setDeviceEffects(@Nullable android.service.notification.ZenDeviceEffects);

    method public void setDeviceEffects(@Nullable android.service.notification.ZenDeviceEffects);

    method public void setEnabled(boolean);

    method public void setInterruptionFilter(int);

    method public void setName(String);

    method public void setZenPolicy(@Nullable android.service.notification.ZenPolicy);

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.app.AutomaticZenRule> CREATOR;

    field @FlaggedApi("android.app.modes_api") public static final int TYPE_BEDTIME = 3; // 0x3

    field @FlaggedApi("android.app.modes_api") public static final int TYPE_DRIVING = 4; // 0x4

    field @FlaggedApi("android.app.modes_api") public static final int TYPE_IMMERSIVE = 5; // 0x5

    field @FlaggedApi("android.app.modes_api") public static final int TYPE_MANAGED = 7; // 0x7

    field @FlaggedApi("android.app.modes_api") public static final int TYPE_OTHER = 0; // 0x0

    field @FlaggedApi("android.app.modes_api") public static final int TYPE_SCHEDULE_CALENDAR = 2; // 0x2

    field @FlaggedApi("android.app.modes_api") public static final int TYPE_SCHEDULE_TIME = 1; // 0x1

    field @FlaggedApi("android.app.modes_api") public static final int TYPE_THEATER = 6; // 0x6

    field @FlaggedApi("android.app.modes_api") public static final int TYPE_UNKNOWN = -1; // 0xffffffff

  }













  @FlaggedApi("android.app.modes_api") public static final class AutomaticZenRule.Builder {













    field public static final int TYPE_BEDTIME = 3; // 0x3













    field public static final int TYPE_DRIVING = 4; // 0x4













    field public static final int TYPE_IMMERSIVE = 5; // 0x5













    field public static final int TYPE_MANAGED = 7; // 0x7













    field public static final int TYPE_OTHER = 0; // 0x0













    field public static final int TYPE_SCHEDULE_CALENDAR = 2; // 0x2













    field public static final int TYPE_SCHEDULE_TIME = 1; // 0x1













    field public static final int TYPE_THEATER = 6; // 0x6













    field public static final int TYPE_UNKNOWN = -1; // 0xffffffff













  }

























  public static final class AutomaticZenRule.Builder {















    ctor public AutomaticZenRule.Builder(@NonNull android.app.AutomaticZenRule);















    ctor public AutomaticZenRule.Builder(@NonNull String, @NonNull android.net.Uri);















    method @NonNull public android.app.AutomaticZenRule build();










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



























  public class NotificationManager {















    method public String addAutomaticZenRule(android.app.AutomaticZenRule);













    method @FlaggedApi("android.app.modes_api") public boolean areAutomaticZenRulesUserManaged();













    method public boolean areAutomaticZenRulesUserManaged();















    method @Deprecated public boolean areBubblesAllowed();















    method public boolean areBubblesEnabled();















    method public boolean areNotificationsEnabled();









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













    method public void deleteNotificationChannelGroup(String);















    method public android.service.notification.StatusBarNotification[] getActiveNotifications();















    method public android.app.AutomaticZenRule getAutomaticZenRule(String);













    method @FlaggedApi("android.app.modes_api") public int getAutomaticZenRuleState(@NonNull String);













    method public int getAutomaticZenRuleState(@NonNull String);















    method public java.util.Map<java.lang.String,android.app.AutomaticZenRule> getAutomaticZenRules();















    method public int getBubblePreference();















    method @NonNull public android.app.NotificationManager.Policy getConsolidatedNotificationPolicy();










@@ -7175,14 +7175,14 @@ package android.app {













    field public static final String ACTION_APP_BLOCK_STATE_CHANGED = "android.app.action.APP_BLOCK_STATE_CHANGED";















    field public static final String ACTION_AUTOMATIC_ZEN_RULE = "android.app.action.AUTOMATIC_ZEN_RULE";















    field public static final String ACTION_AUTOMATIC_ZEN_RULE_STATUS_CHANGED = "android.app.action.AUTOMATIC_ZEN_RULE_STATUS_CHANGED";













    field @FlaggedApi("android.app.modes_api") public static final String ACTION_CONSOLIDATED_NOTIFICATION_POLICY_CHANGED = "android.app.action.CONSOLIDATED_NOTIFICATION_POLICY_CHANGED";













    field public static final String ACTION_CONSOLIDATED_NOTIFICATION_POLICY_CHANGED = "android.app.action.CONSOLIDATED_NOTIFICATION_POLICY_CHANGED";















    field public static final String ACTION_INTERRUPTION_FILTER_CHANGED = "android.app.action.INTERRUPTION_FILTER_CHANGED";















    field public static final String ACTION_NOTIFICATION_CHANNEL_BLOCK_STATE_CHANGED = "android.app.action.NOTIFICATION_CHANNEL_BLOCK_STATE_CHANGED";















    field public static final String ACTION_NOTIFICATION_CHANNEL_GROUP_BLOCK_STATE_CHANGED = "android.app.action.NOTIFICATION_CHANNEL_GROUP_BLOCK_STATE_CHANGED";















    field public static final String ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED = "android.app.action.NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED";















    field public static final String ACTION_NOTIFICATION_POLICY_CHANGED = "android.app.action.NOTIFICATION_POLICY_CHANGED";













    field @FlaggedApi("android.app.modes_api") public static final int AUTOMATIC_RULE_STATUS_ACTIVATED = 4; // 0x4













    field @FlaggedApi("android.app.modes_api") public static final int AUTOMATIC_RULE_STATUS_DEACTIVATED = 5; // 0x5













    field public static final int AUTOMATIC_RULE_STATUS_ACTIVATED = 4; // 0x4













    field public static final int AUTOMATIC_RULE_STATUS_DEACTIVATED = 5; // 0x5















    field public static final int AUTOMATIC_RULE_STATUS_DISABLED = 2; // 0x2















    field public static final int AUTOMATIC_RULE_STATUS_ENABLED = 1; // 0x1















    field public static final int AUTOMATIC_RULE_STATUS_REMOVED = 3; // 0x3









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













    field public static final String EXTRA_BLOCKED_STATE = "android.app.extra.BLOCKED_STATE";















    field public static final String EXTRA_NOTIFICATION_CHANNEL_GROUP_ID = "android.app.extra.NOTIFICATION_CHANNEL_GROUP_ID";















    field public static final String EXTRA_NOTIFICATION_CHANNEL_ID = "android.app.extra.NOTIFICATION_CHANNEL_ID";













    field @FlaggedApi("android.app.modes_api") public static final String EXTRA_NOTIFICATION_POLICY = "android.app.extra.NOTIFICATION_POLICY";













    field public static final String EXTRA_NOTIFICATION_POLICY = "android.app.extra.NOTIFICATION_POLICY";















    field public static final int IMPORTANCE_DEFAULT = 3; // 0x3















    field public static final int IMPORTANCE_HIGH = 4; // 0x4















    field public static final int IMPORTANCE_LOW = 2; // 0x2










@@ -38231,7 +38231,7 @@ package android.provider {













    field public static final String ACTION_APP_OPEN_BY_DEFAULT_SETTINGS = "android.settings.APP_OPEN_BY_DEFAULT_SETTINGS";















    field public static final String ACTION_APP_SEARCH_SETTINGS = "android.settings.APP_SEARCH_SETTINGS";















    field public static final String ACTION_APP_USAGE_SETTINGS = "android.settings.action.APP_USAGE_SETTINGS";













    field @FlaggedApi("android.app.modes_api") public static final String ACTION_AUTOMATIC_ZEN_RULE_SETTINGS = "android.settings.AUTOMATIC_ZEN_RULE_SETTINGS";













    field public static final String ACTION_AUTOMATIC_ZEN_RULE_SETTINGS = "android.settings.AUTOMATIC_ZEN_RULE_SETTINGS";















    field public static final String ACTION_AUTO_ROTATE_SETTINGS = "android.settings.AUTO_ROTATE_SETTINGS";















    field public static final String ACTION_BATTERY_SAVER_SETTINGS = "android.settings.BATTERY_SAVER_SETTINGS";















    field public static final String ACTION_BIOMETRIC_ENROLL = "android.settings.BIOMETRIC_ENROLL";










@@ -38325,7 +38325,7 @@ package android.provider {













    field public static final String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";















    field public static final String EXTRA_APP_PACKAGE = "android.provider.extra.APP_PACKAGE";















    field public static final String EXTRA_AUTHORITIES = "authorities";













    field @FlaggedApi("android.app.modes_api") public static final String EXTRA_AUTOMATIC_ZEN_RULE_ID = "android.provider.extra.AUTOMATIC_ZEN_RULE_ID";













    field public static final String EXTRA_AUTOMATIC_ZEN_RULE_ID = "android.provider.extra.AUTOMATIC_ZEN_RULE_ID";















    field public static final String EXTRA_BATTERY_SAVER_MODE_ENABLED = "android.settings.extra.battery_saver_mode_enabled";















    field public static final String EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED = "android.provider.extra.BIOMETRIC_AUTHENTICATORS_ALLOWED";















    field public static final String EXTRA_CHANNEL_FILTER_LIST = "android.provider.extra.CHANNEL_FILTER_LIST";










@@ -42117,9 +42117,9 @@ package android.service.notification {



























  public final class Condition implements android.os.Parcelable {















    ctor public Condition(android.net.Uri, String, int);













    ctor @FlaggedApi("android.app.modes_api") public Condition(@Nullable android.net.Uri, @Nullable String, int, int);













    ctor public Condition(@Nullable android.net.Uri, @Nullable String, int, int);















    ctor public Condition(android.net.Uri, String, String, String, int, int, int);













    ctor @FlaggedApi("android.app.modes_api") public Condition(@Nullable android.net.Uri, @Nullable String, @Nullable String, @Nullable String, int, int, int, int);













    ctor public Condition(@Nullable android.net.Uri, @Nullable String, @Nullable String, @Nullable String, int, int, int, int);















    ctor public Condition(android.os.Parcel);















    method public android.service.notification.Condition copy();















    method public int describeContents();









@@ -42132,10 +42132,10 @@ package android.service.notification {













    field public static final int FLAG_RELEVANT_ALWAYS = 2; // 0x2















    field public static final int FLAG_RELEVANT_NOW = 1; // 0x1















    field public static final String SCHEME = "condition";













    field @FlaggedApi("android.app.modes_api") public static final int SOURCE_CONTEXT = 3; // 0x3













    field @FlaggedApi("android.app.modes_api") public static final int SOURCE_SCHEDULE = 2; // 0x2













    field @FlaggedApi("android.app.modes_api") public static final int SOURCE_UNKNOWN = 0; // 0x0













    field @FlaggedApi("android.app.modes_api") public static final int SOURCE_USER_ACTION = 1; // 0x1













    field public static final int SOURCE_CONTEXT = 3; // 0x3













    field public static final int SOURCE_SCHEDULE = 2; // 0x2













    field public static final int SOURCE_UNKNOWN = 0; // 0x0













    field public static final int SOURCE_USER_ACTION = 1; // 0x1















    field public static final int STATE_ERROR = 3; // 0x3















    field public static final int STATE_FALSE = 0; // 0x0















    field public static final int STATE_TRUE = 1; // 0x1









@@ -42145,7 +42145,7 @@ package android.service.notification {













    field public final android.net.Uri id;















    field public final String line1;















    field public final String line2;













    field @FlaggedApi("android.app.modes_api") public final int source;













    field public final int source;















    field public final int state;















    field public final String summary;















  }










@@ -42316,7 +42316,7 @@ package android.service.notification {













    field @NonNull public static final android.os.Parcelable.Creator<android.service.notification.StatusBarNotification> CREATOR;















  }



























  @FlaggedApi("android.app.modes_api") public final class ZenDeviceEffects implements android.os.Parcelable {













  public final class ZenDeviceEffects implements android.os.Parcelable {















    method public int describeContents();















    method public boolean shouldDimWallpaper();















    method public boolean shouldDisplayGrayscale();









@@ -42326,7 +42326,7 @@ package android.service.notification {













    field @NonNull public static final android.os.Parcelable.Creator<android.service.notification.ZenDeviceEffects> CREATOR;















  }



























  @FlaggedApi("android.app.modes_api") public static final class ZenDeviceEffects.Builder {













  public static final class ZenDeviceEffects.Builder {















    ctor public ZenDeviceEffects.Builder();















    ctor public ZenDeviceEffects.Builder(@NonNull android.service.notification.ZenDeviceEffects);















    method @NonNull public android.service.notification.ZenDeviceEffects build();









@@ -42348,7 +42348,7 @@ package android.service.notification {













    method public int getPriorityCategoryReminders();















    method public int getPriorityCategoryRepeatCallers();















    method public int getPriorityCategorySystem();













    method @FlaggedApi("android.app.modes_api") public int getPriorityChannelsAllowed();













    method public int getPriorityChannelsAllowed();















    method public int getPriorityConversationSenders();















    method public int getPriorityMessageSenders();















    method public int getVisualEffectAmbient();










@@ -42383,7 +42383,7 @@ package android.service.notification {













    method @NonNull public android.service.notification.ZenPolicy.Builder allowEvents(boolean);















    method @NonNull public android.service.notification.ZenPolicy.Builder allowMedia(boolean);















    method @NonNull public android.service.notification.ZenPolicy.Builder allowMessages(int);













    method @FlaggedApi("android.app.modes_api") @NonNull public android.service.notification.ZenPolicy.Builder allowPriorityChannels(boolean);













    method @NonNull public android.service.notification.ZenPolicy.Builder allowPriorityChannels(boolean);















    method @NonNull public android.service.notification.ZenPolicy.Builder allowReminders(boolean);















    method @NonNull public android.service.notification.ZenPolicy.Builder allowRepeatCallers(boolean);















    method @NonNull public android.service.notification.ZenPolicy.Builder allowSystem(boolean);

























core/api/test-current.txt



+14
−14






























Original line number
Diff line number
Diff line








@@ -393,25 +393,25 @@ package android.app {













  }































  public class NotificationManager {













    method @FlaggedApi("android.app.modes_api") @NonNull public String addAutomaticZenRule(@NonNull android.app.AutomaticZenRule, boolean);













    method @NonNull public String addAutomaticZenRule(@NonNull android.app.AutomaticZenRule, boolean);















    method @FlaggedApi("android.service.notification.notification_classification") public void allowAssistantAdjustment(@NonNull String);















    method public void cleanUpCallersAfter(long);















    method @FlaggedApi("android.service.notification.notification_classification") public void disallowAssistantAdjustment(@NonNull String);













    method @FlaggedApi("android.app.modes_api") @NonNull public android.service.notification.ZenPolicy getDefaultZenPolicy();













    method @NonNull public android.service.notification.ZenPolicy getDefaultZenPolicy();















    method public android.content.ComponentName getEffectsSuppressor();















    method @FlaggedApi("android.service.notification.notification_classification") @NonNull public java.util.Set<java.lang.String> getUnsupportedAdjustmentTypes();















    method public boolean isNotificationPolicyAccessGrantedForPackage(@NonNull String);













    method @FlaggedApi("android.app.modes_api") public boolean removeAutomaticZenRule(@NonNull String, boolean);













    method public boolean removeAutomaticZenRule(@NonNull String, boolean);















    method @FlaggedApi("android.service.notification.notification_classification") public void setAssistantAdjustmentKeyTypeState(int, boolean);















    method @FlaggedApi("android.app.api_rich_ongoing") public void setCanPostPromotedNotifications(@NonNull String, int, boolean);















    method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean, boolean);















    method @RequiresPermission(android.Manifest.permission.MANAGE_TOAST_RATE_LIMITING) public void setToastRateLimitingEnabled(boolean);













    method @FlaggedApi("android.app.modes_api") public boolean updateAutomaticZenRule(@NonNull String, @NonNull android.app.AutomaticZenRule, boolean);













    method public boolean updateAutomaticZenRule(@NonNull String, @NonNull android.app.AutomaticZenRule, boolean);















    method public void updateNotificationChannel(@NonNull String, int, @NonNull android.app.NotificationChannel);















  }































  public static class NotificationManager.Policy implements android.os.Parcelable {













    method @FlaggedApi("android.app.modes_api") public boolean allowPriorityChannels();













    method public boolean allowPriorityChannels();















  }































  public final class PendingIntent implements android.os.Parcelable {










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













  }































  public class UiModeManager {













    method @FlaggedApi("android.app.modes_api") @RequiresPermission(android.Manifest.permission.MODIFY_DAY_NIGHT_MODE) public int getAttentionModeThemeOverlay();













    method @RequiresPermission(android.Manifest.permission.MODIFY_DAY_NIGHT_MODE) public int getAttentionModeThemeOverlay();















    method public boolean isNightModeLocked();















    method public boolean isUiModeLocked();















    method @RequiresPermission(value=android.Manifest.permission.TOGGLE_AUTOMOTIVE_PROJECTION, conditional=true) public boolean releaseProjection(int);















    method @RequiresPermission(value=android.Manifest.permission.TOGGLE_AUTOMOTIVE_PROJECTION, conditional=true) public boolean requestProjection(int);













    field @FlaggedApi("android.app.modes_api") public static final int MODE_ATTENTION_THEME_OVERLAY_DAY = 1002; // 0x3ea













    field @FlaggedApi("android.app.modes_api") public static final int MODE_ATTENTION_THEME_OVERLAY_NIGHT = 1001; // 0x3e9













    field @FlaggedApi("android.app.modes_api") public static final int MODE_ATTENTION_THEME_OVERLAY_OFF = 1000; // 0x3e8













    field @FlaggedApi("android.app.modes_api") public static final int MODE_ATTENTION_THEME_OVERLAY_UNKNOWN = -1; // 0xffffffff













    field public static final int MODE_ATTENTION_THEME_OVERLAY_DAY = 1002; // 0x3ea













    field public static final int MODE_ATTENTION_THEME_OVERLAY_NIGHT = 1001; // 0x3e9













    field public static final int MODE_ATTENTION_THEME_OVERLAY_OFF = 1000; // 0x3e8













    field public static final int MODE_ATTENTION_THEME_OVERLAY_UNKNOWN = -1; // 0xffffffff















    field public static final int PROJECTION_TYPE_ALL = -1; // 0xffffffff















    field public static final int PROJECTION_TYPE_AUTOMOTIVE = 1; // 0x1















    field public static final int PROJECTION_TYPE_NONE = 0; // 0x0










@@ -1716,7 +1716,7 @@ package android.hardware.display {













  }































  public final class ColorDisplayManager {













    method @FlaggedApi("android.app.modes_api") @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public boolean isSaturationActivated();













    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public boolean isSaturationActivated();















  }































  public final class DisplayManager {










@@ -3237,16 +3237,16 @@ package android.service.notification {













    method @Deprecated public boolean isBound();















  }





























  @FlaggedApi("android.app.modes_api") public final class ZenDeviceEffects implements android.os.Parcelable {













  public final class ZenDeviceEffects implements android.os.Parcelable {















    method @NonNull public java.util.Set<java.lang.String> getExtraEffects();















  }





























  @FlaggedApi("android.app.modes_api") public static final class ZenDeviceEffects.Builder {













  public static final class ZenDeviceEffects.Builder {















    method @NonNull public android.service.notification.ZenDeviceEffects.Builder setExtraEffects(@NonNull java.util.Set<java.lang.String>);















  }































  public final class ZenPolicy implements android.os.Parcelable {













    method @FlaggedApi("android.app.modes_api") @NonNull public android.service.notification.ZenPolicy overwrittenWith(@Nullable android.service.notification.ZenPolicy);













    method @NonNull public android.service.notification.ZenPolicy overwrittenWith(@Nullable android.service.notification.ZenPolicy);















  }































  public static final class ZenPolicy.Builder {

































core/java/android/app/AutomaticZenRule.java



+36
−98




























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/app/INotificationManager.aidl



+0
−2






























Original line number
Diff line number
Diff line








@@ -224,8 +224,6 @@ interface INotificationManager













    ZenPolicy getDefaultZenPolicy();















    AutomaticZenRule getAutomaticZenRule(String id);















    Map<String, AutomaticZenRule> getAutomaticZenRules();













    // TODO: b/310620812 - Remove getZenRules() when MODES_API is inlined.













    List<ZenModeConfig.ZenRule> getZenRules();















    String addAutomaticZenRule(in AutomaticZenRule automaticZenRule, String pkg, boolean fromUser);















    boolean updateAutomaticZenRule(String id, in AutomaticZenRule automaticZenRule, boolean fromUser);















    boolean removeAutomaticZenRule(String id, boolean fromUser);

































core/java/android/app/NotificationManager.java



+19
−51




























File changed.
Preview size limit exceeded, changes collapsed.