From f0a6659080ea6f34cbc63e6bc9a489918fa7158c Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Wed, 12 May 2021 08:22:41 -0700 Subject: [PATCH] Clean up setForegroundServiceBehavior() Test: build Bug: 186433888 Change-Id: Ie27cc91cf013bdfb90ab9c60a8c56370f226b87d --- core/java/android/app/Notification.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 2dcdd07c99462..6fba4426b362b 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -174,6 +174,7 @@ public class Notification implements Parcelable */ public static final @ServiceNotificationPolicy int FOREGROUND_SERVICE_DEFERRED = 2; + @ServiceNotificationPolicy private int mFgsDeferBehavior; /** @@ -4614,9 +4615,9 @@ public class Notification implements Parcelable * foreground service. By default, the system can choose to defer * visibility of the notification for a short time after the service is * started. Pass - * {@link Notification#FOREGROUND_SERVICE_IMMEDIATE BEHAVIOR_IMMEDIATE_DISPLAY} + * {@link Notification#FOREGROUND_SERVICE_IMMEDIATE FOREGROUND_SERVICE_IMMEDIATE} * to this method in order to guarantee that visibility is never deferred. Pass - * {@link Notification#FOREGROUND_SERVICE_DEFERRED BEHAVIOR_DEFERRED_DISPLAY} + * {@link Notification#FOREGROUND_SERVICE_DEFERRED FOREGROUND_SERVICE_DEFERRED} * to request that visibility is deferred whenever possible. * *

Note that deferred visibility is not guaranteed. There @@ -4624,13 +4625,13 @@ public class Notification implements Parcelable * service's associated Notification immediately even when the app has used * this method to explicitly request deferred display.

* @param behavior One of - * {@link Notification#FOREGROUND_SERVICE_DEFAULT BEHAVIOR_DEFAULT}, - * {@link Notification#FOREGROUND_SERVICE_IMMEDIATE BEHAVIOR_IMMEDIATE_DISPLAY}, - * or {@link Notification#FOREGROUND_SERVICE_DEFERRED BEHAVIOR_DEFERRED_DISPLAY} + * {@link Notification#FOREGROUND_SERVICE_DEFAULT FOREGROUND_SERVICE_DEFAULT}, + * {@link Notification#FOREGROUND_SERVICE_IMMEDIATE FOREGROUND_SERVICE_IMMEDIATE}, + * or {@link Notification#FOREGROUND_SERVICE_DEFERRED FOREGROUND_SERVICE_DEFERRED} * @return */ @NonNull - public Builder setForegroundServiceBehavior(int behavior) { + public Builder setForegroundServiceBehavior(@ServiceNotificationPolicy int behavior) { mN.mFgsDeferBehavior = behavior; return this; }