Merge "Retire preliminary FGS deferral control API" into sc-dev
diff --git a/core/api/current.txt b/core/api/current.txt
index f546f53..d73e3a0 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -5958,7 +5958,6 @@
method @NonNull public android.app.Notification.Builder setRemoteInputHistory(CharSequence[]);
method @NonNull public android.app.Notification.Builder setSettingsText(CharSequence);
method @NonNull public android.app.Notification.Builder setShortcutId(String);
- method @Deprecated @NonNull public android.app.Notification.Builder setShowForegroundImmediately(boolean);
method @NonNull public android.app.Notification.Builder setShowWhen(boolean);
method @NonNull public android.app.Notification.Builder setSmallIcon(@DrawableRes int);
method @NonNull public android.app.Notification.Builder setSmallIcon(@DrawableRes int, int);
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 1865141..9b594b78 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4595,22 +4595,6 @@
}
/**
- * Set to {@code true} to require that the Notification associated with a
- * foreground service is shown as soon as the service's {@code startForeground()}
- * method is called, even if the system's UI policy might otherwise defer
- * its visibility to a later time.
- * @deprecated Use setForegroundServiceBehavior(int) instead
- */
- @Deprecated
- @NonNull
- public Builder setShowForegroundImmediately(boolean showImmediately) {
- setForegroundServiceBehavior(showImmediately
- ? FOREGROUND_SERVICE_IMMEDIATE
- : FOREGROUND_SERVICE_DEFAULT);
- return this;
- }
-
- /**
* Specify a desired visibility policy for a Notification associated with a
* foreground service. By default, the system can choose to defer
* visibility of the notification for a short time after the service is