Merge "Do not create a RemoveAlreadyRemovedTiles unless needed" into main (fe9b011b) · Commits · e / os / android_frameworks_base

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

+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