Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a3958d authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Added Nullable annotations to NotificationManager API"

parents fdacc3af 5747d630

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -546,10 +546,10 @@ package android.app { 














  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 {

































core/java/android/app/NotificationManager.java



+6
−4




























Original line number
Diff line number
Diff line








@@ -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());