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

Commit aac3cba5 authored by Geoffrey Pitsch's avatar Geoffrey Pitsch Committed by Android (Google) Code Review
Browse files

Merge "Listener in createNotificationChannel"

parents ed1b65b1 e75a66e8

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IBackupAgent.aidl \

	core/java/android/app/IEphemeralResolver.aidl \

	core/java/android/app/IInstrumentationWatcher.aidl \

	core/java/android/app/IOnNotificationChannelCreatedListener.aidl \

	core/java/android/app/INotificationManager.aidl \

	core/java/android/app/IProcessObserver.aidl \

	core/java/android/app/ISearchManager.aidl \

api/current.txt

+5 −1
Original line number Diff line number Diff line
@@ -5395,7 +5395,7 @@ package android.app { 
    method public void cancel(int);

    method public void cancel(java.lang.String, int);

    method public void cancelAll();

    method public void createNotificationChannel(android.app.NotificationChannel);

    method public void createNotificationChannel(android.app.NotificationChannel, android.app.NotificationManager.OnNotificationChannelCreatedListener, android.os.Handler);

    method public void deleteNotificationChannel(java.lang.String);

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

    method public android.app.AutomaticZenRule getAutomaticZenRule(java.lang.String);
@@ -5429,6 +5429,10 @@ package android.app { 
    field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0

  }













  public static abstract interface NotificationManager.OnNotificationChannelCreatedListener {













    method public abstract void onNotificationChannelCreated(android.app.NotificationChannel);













  }



























  public static class NotificationManager.Policy implements android.os.Parcelable {















    ctor public NotificationManager.Policy(int, int, int);















    ctor public NotificationManager.Policy(int, int, int, int);

























api/system-current.txt



+5
−1




























Original line number
Diff line number
Diff line








@@ -5562,7 +5562,7 @@ package android.app {













    method public void cancel(int);















    method public void cancel(java.lang.String, int);















    method public void cancelAll();













    method public void createNotificationChannel(android.app.NotificationChannel);













    method public void createNotificationChannel(android.app.NotificationChannel, android.app.NotificationManager.OnNotificationChannelCreatedListener, android.os.Handler);















    method public void deleteNotificationChannel(java.lang.String);















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















    method public android.app.AutomaticZenRule getAutomaticZenRule(java.lang.String);










@@ -5596,6 +5596,10 @@ package android.app {













    field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0















  }



























  public static abstract interface NotificationManager.OnNotificationChannelCreatedListener {













    method public abstract void onNotificationChannelCreated(android.app.NotificationChannel);













  }



























  public static class NotificationManager.Policy implements android.os.Parcelable {















    ctor public NotificationManager.Policy(int, int, int);















    ctor public NotificationManager.Policy(int, int, int, int);

























api/test-current.txt



+5
−1




























Original line number
Diff line number
Diff line








@@ -5405,7 +5405,7 @@ package android.app {













    method public void cancel(int);















    method public void cancel(java.lang.String, int);















    method public void cancelAll();













    method public void createNotificationChannel(android.app.NotificationChannel);













    method public void createNotificationChannel(android.app.NotificationChannel, android.app.NotificationManager.OnNotificationChannelCreatedListener, android.os.Handler);















    method public void deleteNotificationChannel(java.lang.String);















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















    method public android.app.AutomaticZenRule getAutomaticZenRule(java.lang.String);










@@ -5440,6 +5440,10 @@ package android.app {













    field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0















  }



























  public static abstract interface NotificationManager.OnNotificationChannelCreatedListener {













    method public abstract void onNotificationChannelCreated(android.app.NotificationChannel);













  }



























  public static class NotificationManager.Policy implements android.os.Parcelable {















    ctor public NotificationManager.Policy(int, int, int);















    ctor public NotificationManager.Policy(int, int, int, int);

























core/java/android/app/INotificationManager.aidl



+11
−9




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@





























package android.app;





























import android.app.IOnNotificationChannelCreatedListener;















import android.app.ITransientNotification;















import android.app.Notification;















import android.app.NotificationChannel;










@@ -58,7 +59,8 @@ interface INotificationManager













    int getImportance(String pkg, int uid);















    int getPackageImportance(String pkg);





























    void createNotificationChannel(String pkg, in NotificationChannel channel);













    void createNotificationChannel(String pkg, in NotificationChannel channel,













            in IOnNotificationChannelCreatedListener listener);















    void updateNotificationChannelForPackage(String pkg, int uid, in NotificationChannel channel);















    NotificationChannel getNotificationChannel(String pkg, String channelId);















    NotificationChannel getNotificationChannelForPackage(String pkg, int uid, String channelId);