Merge "Log tile binding" into main (adda536b) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractorTest.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import com.android.systemui.qs.tiles.impl.custom.customTileRepository
		import com.android.systemui.qs.tiles.impl.custom.customTileServiceInteractor
		import com.android.systemui.qs.tiles.impl.custom.customTileSpec
		import com.android.systemui.qs.tiles.impl.custom.data.entity.CustomTileDefaults
		import com.android.systemui.qs.tiles.impl.custom.qsTileLogger
		import com.android.systemui.testKosmos
		import com.android.systemui.user.data.repository.fakeUserRepository
		import com.android.systemui.user.data.repository.userRepository
		@@ -72,6 +73,7 @@ class CustomTileDataInteractorTest : SysuiTestCase() {
		packageUpdatesRepository = customTilePackagesUpdatesRepository,
		userRepository = userRepository,
		tileScope = testScope.backgroundScope,
		qsTileLogger = kosmos.qsTileLogger,
		)
		}

		@@ -152,7 +154,7 @@ class CustomTileDataInteractorTest : SysuiTestCase() {
		collectLastValue(
		underTest.tileData(
		TEST_USER_1.userHandle,
		flowOf(DataUpdateTrigger.InitialRequest)
		flowOf(DataUpdateTrigger.InitialRequest),
		)
		)
		runCurrent()

packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractor.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import com.android.app.tracing.coroutines.launchTraced as launch
		import com.android.systemui.qs.pipeline.shared.TileSpec
		import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger
		import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor
		import com.android.systemui.qs.tiles.base.logging.QSTileLogger
		import com.android.systemui.qs.tiles.impl.custom.data.entity.CustomTileDefaults
		import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTileDefaultsRepository
		import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTilePackageUpdatesRepository
		@@ -56,6 +57,7 @@ constructor(
		private val packageUpdatesRepository: CustomTilePackageUpdatesRepository,
		userRepository: UserRepository,
		@QSTileScope private val tileScope: CoroutineScope,
		qsTileLogger: QSTileLogger,
		) : QSTileDataInteractor<CustomTileDataModel> {

		private val mutableUserFlow = MutableStateFlow(userRepository.getSelectedUserInfo().userHandle)
		@@ -69,6 +71,7 @@ constructor(
		// binding the service might access it
		customTileInteractor.initForUser(user)
		// Bind the TileService for not active tile
		qsTileLogger.logInfo(tileSpec, "onBindingFlow for user:$user")
		serviceInteractor.bindOnStart()

		packageUpdatesRepository

packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileServiceInteractor.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.os.UserHandle
		import android.service.quicksettings.IQSTileService
		import android.service.quicksettings.Tile
		import android.service.quicksettings.TileService
		import com.android.app.tracing.coroutines.launchTraced as launch
		import com.android.systemui.plugins.ActivityStarter
		import com.android.systemui.qs.external.CustomTileInterface
		import com.android.systemui.qs.external.TileServiceManager
		@@ -42,7 +43,6 @@ import kotlinx.coroutines.channels.produce
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.MutableSharedFlow
		import kotlinx.coroutines.flow.MutableStateFlow
		import com.android.app.tracing.coroutines.launchTraced as launch

		/**
		* Communicates with [TileService] via [TileServiceManager] and [IQSTileService]. This interactor is
		@@ -72,6 +72,7 @@ constructor(

		val callingAppIds: Flow<Int>
		get() = tileReceivingInterface.mutableCallingAppIds

		val refreshEvents: Flow<Unit>
		get() = tileReceivingInterface.mutableRefreshEvents

		@@ -144,6 +145,7 @@ constructor(

		private fun getTileServiceManager(): TileServiceManager =
		synchronized(tileServices) {
		qsTileLogger.logInfo(tileSpec, "getTileServiceManager called")
		if (tileServiceManager == null) {
		tileServices
		.getTileWrapper(tileReceivingInterface)
		@@ -173,8 +175,10 @@ constructor(

		override val user: Int
		get() = currentUser.identifier

		override val qsTile: Tile
		get() = customTileInteractor.getTile(currentUser)

		override val component: ComponentName = tileSpec.componentName

		val mutableCallingAppIds = MutableStateFlow(Process.INVALID_UID)