Merge "Added Nullable annotations to NotificationManager API"
diff --git a/api/system-current.txt b/api/system-current.txt
index aec8cc1..28104d5 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -546,10 +546,10 @@
public class NotificationManager {
method @Nullable public android.content.ComponentName getAllowedNotificationAssistant();
- method @Nullable public android.content.ComponentName getAllowedNotificationAssistantForUser(android.os.UserHandle);
+ method @Nullable public android.content.ComponentName getAllowedNotificationAssistantForUser(@NonNull android.os.UserHandle);
method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName);
- method public void setNotificationAssistantAccessGranted(android.content.ComponentName, boolean);
- method public void setNotificationAssistantAccessGrantedForUser(android.content.ComponentName, android.os.UserHandle, boolean);
+ method public void setNotificationAssistantAccessGranted(@Nullable android.content.ComponentName, boolean);
+ method public void setNotificationAssistantAccessGrantedForUser(@Nullable android.content.ComponentName, @NonNull android.os.UserHandle, boolean);
}
public final class StatsManager {
diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index ed7aa4a..204fb6a 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -1277,7 +1277,8 @@
* @hide
*/
@SystemApi
- public void setNotificationAssistantAccessGranted(ComponentName assistant, boolean granted) {
+ public void setNotificationAssistantAccessGranted(@Nullable ComponentName assistant,
+ boolean granted) {
INotificationManager service = getService();
try {
service.setNotificationAssistantAccessGranted(assistant, granted);
@@ -1296,8 +1297,8 @@
* @hide
*/
@SystemApi
- public void setNotificationAssistantAccessGrantedForUser(ComponentName assistant,
- UserHandle user, boolean granted) {
+ public void setNotificationAssistantAccessGrantedForUser(@Nullable ComponentName assistant,
+ @NonNull UserHandle user, boolean granted) {
INotificationManager service = getService();
try {
service.setNotificationAssistantAccessGrantedForUser(assistant, user.getIdentifier(),
@@ -1319,7 +1320,8 @@
/** @hide */
@SystemApi
- public @Nullable ComponentName getAllowedNotificationAssistantForUser(UserHandle user) {
+ public @Nullable ComponentName getAllowedNotificationAssistantForUser(
+ @NonNull UserHandle user) {
INotificationManager service = getService();
try {
return service.getAllowedNotificationAssistantForUser(user.getIdentifier());