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

Commit c749b02b authored by Lyn Han's avatar Lyn Han
Browse files

Delete avalanche suppression flag 

Fixes: 409607456
Test: presubmit
Flag: com.android.systemui.notification_avalanche_suppression
Change-Id: I0fcfd7a732d13e9093611f3cdda21cbc705cc4d8
parent 3070277b

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

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import com.android.systemui.Flags.FLAG_COMMUNAL_HUB 
import com.android.systemui.Flags.communalHub

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionRefactor

import com.android.systemui.statusbar.notification.shared.NotificationAvalancheSuppression

import com.android.systemui.statusbar.notification.shared.NotificationMinimalism

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun

import javax.inject.Inject
@@ -41,7 +40,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        vibrateWhileUnlockedToken dependsOn politeNotifications



        // Internal notification frontend dependencies

        NotificationAvalancheSuppression.token dependsOn VisualInterruptionRefactor.token

        NotificationMinimalism.token dependsOn NotificationThrottleHun.token

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImpl.kt

+12 −16
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.systemui.statusbar.notification.interruption.VisualInterrupti 
import com.android.systemui.statusbar.notification.interruption.VisualInterruptionType.BUBBLE

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionType.PEEK

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionType.PULSE

import com.android.systemui.statusbar.notification.shared.NotificationAvalancheSuppression

import com.android.systemui.statusbar.policy.BatteryController

import com.android.systemui.statusbar.policy.DeviceProvisionedController

import com.android.systemui.statusbar.policy.KeyguardStateController
@@ -185,8 +184,6 @@ constructor( 
        addFilter(HunJustLaunchedFsiSuppressor())

        addFilter(AlertAppSuspendedSuppressor())

        addFilter(AlertKeyguardVisibilitySuppressor(keyguardNotificationVisibilityProvider))



        if (NotificationAvalancheSuppression.isEnabled) {

        addFilter(

            AvalancheSuppressor(

                avalancheProvider,
@@ -200,7 +197,6 @@ constructor( 
            )

        )

        avalancheProvider.register()

        }

        started = true

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationAvalancheSuppression.kt

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.notification.shared



import com.android.systemui.Flags

import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.RefactorFlagUtils



/** Helper for reading or using the notification avalanche suppression flag state. */

@Suppress("NOTHING_TO_INLINE")

object NotificationAvalancheSuppression {

    /** The aconfig flag name */

    const val FLAG_NAME = Flags.FLAG_NOTIFICATION_AVALANCHE_SUPPRESSION



    /** A token used for dependency declaration */

    val token: FlagToken

        get() = FlagToken(FLAG_NAME, isEnabled)



    /** Is the refactor enabled */

    @JvmStatic

    inline val isEnabled

        get() = Flags.notificationAvalancheSuppression()



    /**

     * Called to ensure code is only run when the flag is enabled. This protects users from the

     * unintended behaviors caused by accidentally running new logic, while also crashing on an eng

     * build to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun isUnexpectedlyInLegacyMode() =

            RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is disabled. This will throw an exception if

     * the flag is enabled to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)

}
 
 No newline at end of file