1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index ed7aa4a097eb..204fb6aeb529 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -1277,7 +1277,8 @@ public class NotificationManager {
      * @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 @@ public class NotificationManager {
      * @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 @@ public class NotificationManager {
 
     /** @hide */
     @SystemApi
-    public @Nullable ComponentName getAllowedNotificationAssistantForUser(UserHandle user) {
+    public @Nullable ComponentName getAllowedNotificationAssistantForUser(
+            @NonNull UserHandle user) {
         INotificationManager service = getService();
         try {
             return service.getAllowedNotificationAssistantForUser(user.getIdentifier());