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

Commit 4914803e authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Add user to channel/group modification callbacks." into oc-dev am: 1ed27714 

am: c04cb25c

Change-Id: Ic73c2271e9a764a032392c71a6cf46839e2c06e0
parents 2a5c3552 c04cb25c

api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -37435,16 +37435,16 @@ package android.service.notification { 
    method public final int getCurrentInterruptionFilter();

    method public final int getCurrentListenerHints();

    method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking();

    method public final java.util.List<android.app.NotificationChannelGroup> getNotificationChannelGroups(java.lang.String);

    method public final java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String);

    method public final java.util.List<android.app.NotificationChannelGroup> getNotificationChannelGroups(java.lang.String, android.os.UserHandle);

    method public final java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String, android.os.UserHandle);

    method public final android.service.notification.StatusBarNotification[] getSnoozedNotifications();

    method public android.os.IBinder onBind(android.content.Intent);

    method public void onInterruptionFilterChanged(int);

    method public void onListenerConnected();

    method public void onListenerDisconnected();

    method public void onListenerHintsChanged(int);

    method public void onNotificationChannelGroupModified(java.lang.String, android.app.NotificationChannelGroup, int);

    method public void onNotificationChannelModified(java.lang.String, android.app.NotificationChannel, int);

    method public void onNotificationChannelGroupModified(java.lang.String, android.os.UserHandle, android.app.NotificationChannelGroup, int);

    method public void onNotificationChannelModified(java.lang.String, android.os.UserHandle, android.app.NotificationChannel, int);

    method public void onNotificationPosted(android.service.notification.StatusBarNotification);

    method public void onNotificationPosted(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);

    method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap);
@@ -37457,7 +37457,7 @@ package android.service.notification { 
    method public final void requestUnbind();

    method public final void setNotificationsShown(java.lang.String[]);

    method public final void snoozeNotification(java.lang.String, long);

    method public final void updateNotificationChannel(java.lang.String, android.app.NotificationChannel);

    method public final void updateNotificationChannel(java.lang.String, android.os.UserHandle, android.app.NotificationChannel);

    field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4

    field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1

    field public static final int HINT_HOST_DISABLE_NOTIFICATION_EFFECTS = 2; // 0x2

api/system-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -40575,16 +40575,16 @@ package android.service.notification { 
    method public final int getCurrentInterruptionFilter();

    method public final int getCurrentListenerHints();

    method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking();

    method public final java.util.List<android.app.NotificationChannelGroup> getNotificationChannelGroups(java.lang.String);

    method public final java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String);

    method public final java.util.List<android.app.NotificationChannelGroup> getNotificationChannelGroups(java.lang.String, android.os.UserHandle);

    method public final java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String, android.os.UserHandle);

    method public final android.service.notification.StatusBarNotification[] getSnoozedNotifications();

    method public android.os.IBinder onBind(android.content.Intent);

    method public void onInterruptionFilterChanged(int);

    method public void onListenerConnected();

    method public void onListenerDisconnected();

    method public void onListenerHintsChanged(int);

    method public void onNotificationChannelGroupModified(java.lang.String, android.app.NotificationChannelGroup, int);

    method public void onNotificationChannelModified(java.lang.String, android.app.NotificationChannel, int);

    method public void onNotificationChannelGroupModified(java.lang.String, android.os.UserHandle, android.app.NotificationChannelGroup, int);

    method public void onNotificationChannelModified(java.lang.String, android.os.UserHandle, android.app.NotificationChannel, int);

    method public void onNotificationPosted(android.service.notification.StatusBarNotification);

    method public void onNotificationPosted(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);

    method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap);
@@ -40601,7 +40601,7 @@ package android.service.notification { 
    method public final void snoozeNotification(java.lang.String, java.lang.String);

    method public final void snoozeNotification(java.lang.String, long);

    method public void unregisterAsSystemService() throws android.os.RemoteException;

    method public final void updateNotificationChannel(java.lang.String, android.app.NotificationChannel);

    method public final void updateNotificationChannel(java.lang.String, android.os.UserHandle, android.app.NotificationChannel);

    field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4

    field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1

    field public static final int HINT_HOST_DISABLE_NOTIFICATION_EFFECTS = 2; // 0x2

api/test-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -37614,16 +37614,16 @@ package android.service.notification { 
    method public final int getCurrentInterruptionFilter();

    method public final int getCurrentListenerHints();

    method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking();

    method public final java.util.List<android.app.NotificationChannelGroup> getNotificationChannelGroups(java.lang.String);

    method public final java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String);

    method public final java.util.List<android.app.NotificationChannelGroup> getNotificationChannelGroups(java.lang.String, android.os.UserHandle);

    method public final java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String, android.os.UserHandle);

    method public final android.service.notification.StatusBarNotification[] getSnoozedNotifications();

    method public android.os.IBinder onBind(android.content.Intent);

    method public void onInterruptionFilterChanged(int);

    method public void onListenerConnected();

    method public void onListenerDisconnected();

    method public void onListenerHintsChanged(int);

    method public void onNotificationChannelGroupModified(java.lang.String, android.app.NotificationChannelGroup, int);

    method public void onNotificationChannelModified(java.lang.String, android.app.NotificationChannel, int);

    method public void onNotificationChannelGroupModified(java.lang.String, android.os.UserHandle, android.app.NotificationChannelGroup, int);

    method public void onNotificationChannelModified(java.lang.String, android.os.UserHandle, android.app.NotificationChannel, int);

    method public void onNotificationPosted(android.service.notification.StatusBarNotification);

    method public void onNotificationPosted(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);

    method public void onNotificationRankingUpdate(android.service.notification.NotificationListenerService.RankingMap);
@@ -37637,7 +37637,7 @@ package android.service.notification { 
    method public final void setNotificationsShown(java.lang.String[]);

    method public final void snoozeNotification(java.lang.String, java.lang.String);

    method public final void snoozeNotification(java.lang.String, long);

    method public final void updateNotificationChannel(java.lang.String, android.app.NotificationChannel);

    method public final void updateNotificationChannel(java.lang.String, android.os.UserHandle, android.app.NotificationChannel);

    field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4

    field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1

    field public static final int HINT_HOST_DISABLE_NOTIFICATION_EFFECTS = 2; // 0x2

core/java/android/app/INotificationManager.aidl

+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.Intent; 
import android.content.pm.ParceledListSlice;

import android.net.Uri;

import android.os.Bundle;

import android.os.UserHandle;

import android.service.notification.Adjustment;

import android.service.notification.Condition;

import android.service.notification.IConditionListener;
@@ -101,9 +102,9 @@ interface INotificationManager 
    void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);

    void setInterruptionFilter(String pkg, int interruptionFilter);



    void updateNotificationChannelFromPrivilegedListener(in INotificationListener token, String pkg, in NotificationChannel channel);

    ParceledListSlice getNotificationChannelsFromPrivilegedListener(in INotificationListener token, String pkg);

    ParceledListSlice getNotificationChannelGroupsFromPrivilegedListener(in INotificationListener token, String pkg);

    void updateNotificationChannelFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannel channel);

    ParceledListSlice getNotificationChannelsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);

    ParceledListSlice getNotificationChannelGroupsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);



    void applyEnqueuedAdjustmentFromAssistant(in INotificationListener token, in Adjustment adjustment);

    void applyAdjustmentFromAssistant(in INotificationListener token, in Adjustment adjustment);

core/java/android/service/notification/INotificationListener.aidl

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.service.notification; 


import android.app.NotificationChannel;

import android.app.NotificationChannelGroup;

import android.os.UserHandle;

import android.service.notification.IStatusBarNotificationHolder;

import android.service.notification.StatusBarNotification;

import android.service.notification.NotificationRankingUpdate;
@@ -36,8 +37,8 @@ oneway interface INotificationListener 
    void onInterruptionFilterChanged(int interruptionFilter);



    // companion device managers only

    void onNotificationChannelModification(String pkgName, in NotificationChannel channel, int modificationType);

    void onNotificationChannelGroupModification(String pkgName, in NotificationChannelGroup group, int modificationType);

    void onNotificationChannelModification(String pkgName, in UserHandle user, in NotificationChannel channel, int modificationType);

    void onNotificationChannelGroupModification(String pkgName, in UserHandle user, in NotificationChannelGroup group, int modificationType);



    // rankers only

    void onNotificationEnqueued(in IStatusBarNotificationHolder notificationHolder);