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

Commit f40c682c authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Do not create a RemoveAlreadyRemovedTiles unless needed 

If the flag is off, we should not create it (as it will fail the
assertion). This passed in presubmit because `assert` does not throw in
regular builds.

Test: gradle build
Fixes: 435705200
Flag: com.android.systemui.reset_tiles_removes_custom_tiles
Change-Id: Ib6005ece4c7f7a7efecfad8e14c413276ae79ed6
parent 9ecb8db6

packages/SystemUI/src/com/android/systemui/qs/pipeline/dagger/QSPipelineModule.kt

+3 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.qs.pipeline.shared.logging.QSPipelineLogger 
import com.android.systemui.qs.tiles.base.domain.interactor.DisabledByPolicyInteractor

import com.android.systemui.qs.tiles.base.domain.interactor.DisabledByPolicyInteractorImpl

import dagger.Binds

import dagger.Lazy

import dagger.Module

import dagger.Provides

import dagger.multibindings.ClassKey
@@ -108,9 +109,9 @@ abstract class QSPipelineModule { 
        @Provides

        @IntoSet

        fun bindTileDbUpgradeToV2(

            impl: RemoveAlreadyRemovedTiles

            impl: Lazy<RemoveAlreadyRemovedTiles>

        ): Optional<CustomTileAddedUpgrade> {

            return if (resetTilesRemovesCustomTiles()) Optional.of(impl) else Optional.empty()

            return if (resetTilesRemovesCustomTiles()) Optional.of(impl.get()) else Optional.empty()

        }



        @Provides

packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/upgrade/RemoveAlreadyRemovedTiles.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class RemoveAlreadyRemovedTiles 
constructor(private val currentTilesInteractor: CurrentTilesInteractor) : CustomTileAddedUpgrade {



    init {

        assert(resetTilesRemovesCustomTiles())

        check(resetTilesRemovesCustomTiles())

    }



    override val version: Int