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

Commit 1bbd133d authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Allow listeners more snoozing options."

parents 056f4223 b6c1f99b

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -35094,6 +35094,8 @@ 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 snoozeNotification(java.lang.String);

    method public final void unsnoozeNotification(java.lang.String);

    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

+2 −0
Original line number Diff line number Diff line
@@ -37893,7 +37893,9 @@ package android.service.notification { 
    method public final void setNotificationsShown(java.lang.String[]);

    method public final void setOnNotificationPostedTrim(int);

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

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

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

    method public final void unsnoozeNotification(java.lang.String);

    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

+3 −0
Original line number Diff line number Diff line
@@ -5395,6 +5395,7 @@ package android.app { 
    method public android.app.AutomaticZenRule getAutomaticZenRule(java.lang.String);

    method public java.util.Map<java.lang.String, android.app.AutomaticZenRule> getAutomaticZenRules();

    method public final int getCurrentInterruptionFilter();

    method public android.content.ComponentName getEffectsSuppressor();

    method public int getImportance();

    method public android.app.NotificationChannel getNotificationChannel(java.lang.String);

    method public java.util.List<android.app.NotificationChannel> getNotificationChannels();
@@ -35187,6 +35188,8 @@ 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 snoozeNotification(java.lang.String);

    method public final void unsnoozeNotification(java.lang.String);

    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 −1
Original line number Diff line number Diff line
@@ -77,7 +77,10 @@ interface INotificationManager 
    void cancelNotificationFromListener(in INotificationListener token, String pkg, String tag, int id);

    void cancelNotificationsFromListener(in INotificationListener token, in String[] keys);



    void snoozeNotificationFromListener(in INotificationListener token, String key, long until);



    void snoozeNotificationUntilFromListener(in INotificationListener token, String key, long until);

    void snoozeNotificationFromListener(in INotificationListener token, String key);

    void unsnoozeNotificationFromListener(in INotificationListener token, String key);



    void requestBindListener(in ComponentName component);

    void requestUnbindListener(in INotificationListener token);

core/java/android/app/NotificationManager.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SdkConstant;

import android.annotation.TestApi;

import android.app.Notification.Builder;

import android.content.ComponentName;

import android.content.Context;
@@ -428,6 +429,7 @@ public class NotificationManager 
    /**

     * @hide

     */

    @TestApi

    public ComponentName getEffectsSuppressor() {

        INotificationManager service = getService();

        try {