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

Commit 6bab1dfe authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB] Use RootModernization flag helper class in ChipsModernization. 

I needed to manually disable RootModernization by changing the flag
helper class, but then realized that didn't disable ChipsModernization
and it caused a crash. This CL isn't strictly necessary at all, it
just helps if we want to disable/enable flags by changing the flag
helper class instead of the flag status.

Bug: N/A
Test: compiles
Flag: com.android.systemui.status_bar_chips_modernization
Change-Id: I7c45cbc02b2a075e977369c2d40a9f3f3aabfa74
parent 2b40ec37

packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/StatusBarChipsModernization.kt

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.phone.ongoingcall 
import com.android.systemui.Flags

import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.RefactorFlagUtils

import com.android.systemui.statusbar.core.StatusBarRootModernization



/** Helper for reading or using the status_bar_use_interactor_for_call_chip flag state. */

@Suppress("NOTHING_TO_INLINE")
@@ -36,7 +37,7 @@ object StatusBarChipsModernization { 
    /** Is the refactor enabled */

    @JvmStatic

    inline val isEnabled

        get() = Flags.statusBarChipsModernization() && Flags.statusBarRootModernization()

        get() = Flags.statusBarChipsModernization() && StatusBarRootModernization.isEnabled



    /**

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