Merge "API feedback: make bubble pref an int def" into sc-dev

This commit is contained in:
Mady Mellor 2021-04-08 19:12:53 +00:00 committed by Android (Google) Code Review
commit a7e6b9481b

View File

@ -419,6 +419,14 @@ public class NotificationManager {
@Retention(RetentionPolicy.SOURCE)
public @interface Importance {}
/** @hide */
@IntDef(prefix = { "BUBBLE_PREFERENCE_" }, value = {
BUBBLE_PREFERENCE_NONE, BUBBLE_PREFERENCE_SELECTED,
BUBBLE_PREFERENCE_ALL
})
@Retention(RetentionPolicy.SOURCE)
public @interface BubblePreference {}
/**
* Activity Action: Launch an Automatic Zen Rule configuration screen
* <p>
@ -1379,7 +1387,7 @@ public class NotificationManager {
* @see Notification#getBubbleMetadata()
* @return the users' bubble preference for the app.
*/
public int getBubblePreference() {
public @BubblePreference int getBubblePreference() {
INotificationManager service = getService();
try {
return service.getBubblePreferenceForPackage(mContext.getPackageName(),