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

Commit 11f386e9 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Retire preliminary FGS deferral control API" into sc-dev am: 023570d0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703963

Change-Id: I2b413742e88115d143a13b3caeefcdb231402a6b
parents aac765d7 023570d0

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5958,7 +5958,6 @@ package android.app { 
    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);

core/java/android/app/Notification.java

+0 −16
Original line number Diff line number Diff line
@@ -4594,22 +4594,6 @@ public class Notification implements Parcelable 
            return this;

        }



        /**

         * 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