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

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

Merge "API improvements for creating NotificationChannels"

parents 955da480 03533715

Android.mk

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

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

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

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

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

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

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

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

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

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

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

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

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

api/current.txt

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

    method public void cancel(int);

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

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

    method public void cancelAll();

    method public void cancelAll();

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

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

    method public void createNotificationChannels(java.util.List<android.app.NotificationChannel>);

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

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

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

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

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

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

    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 {







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











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







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











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







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

























api/system-current.txt



+2
−5




























Original line number
Original line
Diff line number
Diff line








@@ -5586,7 +5586,8 @@ package android.app {









    method public void cancel(int);







    method public void cancel(int);











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







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











    method public void cancelAll();







    method public void cancelAll();











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







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














    method public void createNotificationChannels(java.util.List<android.app.NotificationChannel>);











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







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











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







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











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







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










@@ -5620,10 +5621,6 @@ package android.app {









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







    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 {







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











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







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











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







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

























api/test-current.txt



+2
−5




























Original line number
Original line
Diff line number
Diff line








@@ -5423,7 +5423,8 @@ package android.app {









    method public void cancel(int);







    method public void cancel(int);











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







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











    method public void cancelAll();







    method public void cancelAll();











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







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














    method public void createNotificationChannels(java.util.List<android.app.NotificationChannel>);











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







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











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







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











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







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










@@ -5458,10 +5459,6 @@ package android.app {









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







    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 {







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











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







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











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







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

























core/java/android/app/INotificationManager.aidl



+1
−3




























Original line number
Original line
Diff line number
Diff line








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





























package android.app;







package android.app;































import android.app.IOnNotificationChannelCreatedListener;














import android.app.ITransientNotification;







import android.app.ITransientNotification;











import android.app.Notification;







import android.app.Notification;











import android.app.NotificationChannel;







import android.app.NotificationChannel;










@@ -52,8 +51,7 @@ interface INotificationManager









    boolean areNotificationsEnabled(String pkg);







    boolean areNotificationsEnabled(String pkg);











    int getPackageImportance(String pkg);







    int getPackageImportance(String pkg);































    void createNotificationChannel(String pkg, in NotificationChannel channel,







    void createNotificationChannels(String pkg, in ParceledListSlice channelsList);











            in IOnNotificationChannelCreatedListener listener);














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







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











    NotificationChannel getNotificationChannel(String pkg, String channelId);







    NotificationChannel getNotificationChannel(String pkg, String channelId);











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







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