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

Commit f9ef49e3 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Remove Flags.DISABLE_FSI" into udc-dev am: 829a3b61 

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



Change-Id: I5a791b979538732221b44dd05ac1c9ba9b790b30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f137667c 829a3b61

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ object Flags { 
    // TODO(b/259130119): Tracking Bug

    val FSI_ON_DND_UPDATE = releasedFlag(259130119, "fsi_on_dnd_update")



    // TODO(b/265804648): Tracking Bug

    @JvmField val DISABLE_FSI = unreleasedFlag(265804648, "disable_fsi")



    // TODO(b/254512538): Tracking Bug

    val INSTANT_VOICE_REPLY = releasedFlag(111, "instant_voice_reply")

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt

+0 −6
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ class NotifPipelineFlags @Inject constructor( 
    val featureFlags: FeatureFlags,

    val sysPropFlags: FlagResolver,

) {

    init {

        featureFlags.addListener(Flags.DISABLE_FSI) { event -> event.requestNoRestart() }

    }



    fun isDevLoggingEnabled(): Boolean =

        featureFlags.isEnabled(Flags.NOTIFICATION_PIPELINE_DEVELOPER_LOGGING)
@@ -40,8 +36,6 @@ class NotifPipelineFlags @Inject constructor( 


    fun fsiOnDNDUpdate(): Boolean = featureFlags.isEnabled(Flags.FSI_ON_DND_UPDATE)



    fun disableFsi(): Boolean = featureFlags.isEnabled(Flags.DISABLE_FSI)



    fun forceDemoteFsi(): Boolean =

            sysPropFlags.isEnabled(NotificationFlags.FSI_FORCE_DEMOTE)

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProvider.java

+0 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ public interface NotificationInterruptStateProvider { 
         * Full screen intents are disabled.

         */

        NO_FSI_SHOW_STICKY_HUN(false),

        /**

         * Full screen intents are disabled.

         */

        NO_FSI_DISABLED(false),

        /**

         * No full screen intent included, so there is nothing to show.

         */

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java

+0 −7
Original line number Diff line number Diff line
@@ -244,10 +244,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 


    @Override

    public FullScreenIntentDecision getFullScreenIntentDecision(NotificationEntry entry) {

        if (mFlags.disableFsi()) {

            return FullScreenIntentDecision.NO_FSI_DISABLED;

        }



        if (entry.getSbn().getNotification().fullScreenIntent == null) {

            if (entry.isStickyAndNotDemoted()) {

                return FullScreenIntentDecision.NO_FSI_SHOW_STICKY_HUN;
@@ -343,9 +339,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
            case NO_FSI_SHOW_STICKY_HUN:

                mLogger.logNoFullscreen(entry, "Permission denied, show sticky HUN");

                return;

            case NO_FSI_DISABLED:

                mLogger.logNoFullscreen(entry, "Disabled");

                return;

            case NO_FULL_SCREEN_INTENT:

                return;

            case NO_FSI_SUPPRESSED_BY_DND: