Merge "API feedback: make bubble pref an int def" into sc-dev (a7e6b948) · Commits · e / os / android_frameworks_base

core/java/android/app/NotificationManager.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -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(),