diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/app/Notification.java | 16 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 8ec7594773af..9621acfdd579 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5485,7 +5485,8 @@ package android.app { method @NonNull public android.graphics.drawable.Icon getIcon(); method @NonNull public android.app.PendingIntent getIntent(); method @Deprecated public boolean getSuppressInitialNotification(); - method public boolean getSuppressNotification(); + method @Deprecated public boolean getSuppressNotification(); + method public boolean isNotificationSuppressed(); method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.app.Notification.BubbleMetadata> CREATOR; } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 524832971864..0c6c77f8e36b 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -8645,19 +8645,29 @@ public class Notification implements Parcelable * @return whether this bubble should suppress the initial notification when it is posted. * * @see BubbleMetadata.Builder#setSuppressInitialNotification(boolean) - * @deprecated TO BE REMOVED, use {@link #getSuppressNotification()} instead. + * @deprecated TO BE REMOVED, use {@link #isNotificationSuppressed()} instead. */ @Deprecated public boolean getSuppressInitialNotification() { - return (mFlags & FLAG_SUPPRESS_NOTIFICATION) != 0; + return isNotificationSuppressed(); } /** * @return whether this bubble should suppress the notification when it is posted. * - * @see BubbleMetadata.Builder#setSuppressInitialNotification(boolean) + * @see BubbleMetadata.Builder#setSuppressNotification(boolean) + * @deprecated TO BE REMOVED, use {@link #isNotificationSuppressed()} instead. */ public boolean getSuppressNotification() { + return isNotificationSuppressed(); + } + + /** + * @return whether this bubble should suppress the notification when it is posted. + * + * @see BubbleMetadata.Builder#setSuppressNotification(boolean) + */ + public boolean isNotificationSuppressed() { return (mFlags & FLAG_SUPPRESS_NOTIFICATION) != 0; } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index acdcfb2ea688..5b31b5cffb21 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -583,7 +583,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi private void updateShowInShadeForSuppressNotification(NotificationEntry entry) { boolean suppressNotification = entry.getBubbleMetadata() != null - && entry.getBubbleMetadata().getSuppressNotification() + && entry.getBubbleMetadata().isNotificationSuppressed() && isForegroundApp(mContext, entry.notification.getPackageName()); entry.setShowInShadeWhenBubble(!suppressNotification); } |