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

Commit a6b5c942 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Api review feedback."

parents 184465db a11d0b18

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ public final class Settings { 
    public static final String ACTION_ZEN_MODE_SETTINGS = "android.settings.ZEN_MODE_SETTINGS";



    /**

     * Activity Action: Show Zen Mode priority configuration settings.

     * Activity Action: Show Zen Mode (aka Do Not Disturb) priority configuration settings.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_ZEN_MODE_PRIORITY_SETTINGS

core/java/android/service/notification/ConditionProviderService.java

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public abstract class ConditionProviderService extends Service { 
    }



    /**

     * Request that the provider be rebound, after a previous call to (@link requestUnbind).

     * Request that the provider be rebound, after a previous call to (@link #requestUnbind).

     *

     * <p>This method will fail for providers that have not been granted the permission by the user.

     */

core/java/android/service/notification/NotificationListenerService.java

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ public abstract class NotificationListenerService extends Service { 


    // Notification cancellation reasons



    /** Notification was canceled by the status bar reporting a click. */

    /** Notification was canceled by the status bar reporting a notification click. */

    public static final int REASON_DELEGATE_CLICK = 1;

    /** Notification was canceled by the status bar reporting a user dismissal. */

    public static final int REASON_DELEGATE_CANCEL = 2;
@@ -636,7 +636,7 @@ public abstract class NotificationListenerService extends Service { 
     * <p>The service should wait for the {@link #onListenerConnected()} event

     * before performing this operation.

     *

     * @return An array of active notifications, sorted in natural order.

     * @return An array of snoozed notifications, sorted in natural order.

     */

    public final StatusBarNotification[] getSnoozedNotifications() {

        try {

core/java/android/service/notification/StatusBarNotification.java

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ public class StatusBarNotification implements Parcelable { 
        this.groupKey = groupKey();

    }



    /**

     * @deprecated Non-system apps should not need to create StatusBarNotifications.

     */

    @Deprecated

    public StatusBarNotification(String pkg, String opPkg, int id, String tag, int uid,

            int initialPid, int score, Notification notification, UserHandle user,