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

Commit 5a852f89 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Rename assertInNewMode to unsafeAssertInNewMode" into main

parents 76a6b69c afe69af1

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ constructor( 


    @VisibleForTesting

    internal fun listenForDnd(scope: CoroutineScope): Job {

        ModesUi.assertInNewMode()

        ModesUi.unsafeAssertInNewMode()

        return scope.launch {

            zenModeInteractor.dndMode.collect {

                val zenMode =

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −2
Original line number Diff line number Diff line
@@ -2923,13 +2923,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, CoreSt 
    private boolean isPrimaryBouncerShowingOrWillBeShowing(

            ObservableTransitionState transitionState

    ) {

        SceneContainerFlag.assertInNewMode();

        SceneContainerFlag.unsafeAssertInNewMode();

        return isPrimaryBouncerFullyShown(transitionState)

                || transitionState.isTransitioning(null, Overlays.Bouncer);

    }



    private boolean isPrimaryBouncerFullyShown(ObservableTransitionState transitionState) {

        SceneContainerFlag.assertInNewMode();

        SceneContainerFlag.unsafeAssertInNewMode();

        return transitionState.isIdle(Overlays.Bouncer);

    }

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ constructor( 
     */

    fun bindDetailsView(view: View) {

        // If `QsDetailedView` is not enabled, it should show the dialog.

        QsDetailedView.assertInNewMode()

        QsDetailedView.unsafeAssertInNewMode()



        cancelJob()

packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayScopeRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ constructor( 
    }



    override fun start() {

        StatusBarConnectedDisplays.assertInNewMode()

        StatusBarConnectedDisplays.unsafeAssertInNewMode()

        backgroundApplicationScope.launch {

            displayRepository.displayRemovalEvent.collect { displayId ->

                val scope = perDisplayScopes.remove(displayId)

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

+2 −2
Original line number Diff line number Diff line
@@ -86,12 +86,12 @@ object RefactorFlagUtils { 
     * Example usage:

     * ```

     * public void setSomeNewController(SomeController someController) {

     *     SomeRefactor.assertInNewMode();

     *     SomeRefactor.unsafeAssertInNewMode();

     *     mSomeController = someController;

     * }

     * ````

     */

    inline fun assertInNewMode(isEnabled: Boolean, flagName: Any) =

    inline fun unsafeAssertInNewMode(isEnabled: Boolean, flagName: Any) =

        check(isEnabled) { "New code path not supported when $flagName is disabled." }



    /**