diff options
4 files changed, 0 insertions, 20 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index be1b59d7b93e..cbbd3e6bb747 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -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") diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt index fc89be2c6670..00d8c421c721 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt @@ -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) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProvider.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProvider.java index ae19febadfaa..9001470ad406 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProvider.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProvider.java @@ -35,10 +35,6 @@ public interface NotificationInterruptStateProvider { */ 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. */ NO_FULL_SCREEN_INTENT(false), diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java index 0163dbef2760..9f45b9d67189 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java @@ -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: |