diff options
| author | 2023-12-28 15:19:13 +0000 | |
|---|---|---|
| committer | 2023-12-28 15:19:13 +0000 | |
| commit | b1b2c84cdf7d235db64f3d611c2a2e67eb0ab6fb (patch) | |
| tree | 0c0beb033f704793ae3d77a69353d0c845c44455 | |
| parent | acb6a4fa4753ab30a4cb473c4bdcaffee626e9f6 (diff) | |
| parent | 02b638a1b7beee0291558a5e96f665ff1e25231a (diff) | |
Merge "Fix incorrect IntDef annotation in getPriorityConversationSenders" into main
| -rw-r--r-- | core/java/android/service/notification/ZenPolicy.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/service/notification/ZenPolicy.java b/core/java/android/service/notification/ZenPolicy.java index b1680abfadeb..3c1a2796de95 100644 --- a/core/java/android/service/notification/ZenPolicy.java +++ b/core/java/android/service/notification/ZenPolicy.java @@ -256,7 +256,7 @@ public final class ZenPolicy implements Parcelable { * @return {@link #CONVERSATION_SENDERS_UNSET}, {@link #CONVERSATION_SENDERS_ANYONE}, * {@link #CONVERSATION_SENDERS_IMPORTANT}, {@link #CONVERSATION_SENDERS_NONE}. */ - public @PeopleType int getPriorityConversationSenders() { + public @ConversationSenders int getPriorityConversationSenders() { return mConversationSenders; } |