Merge "[Sat] Replace device provisioned check with satellite provisioned" into main (54955877) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/DeviceBasedSatelliteRepository.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,9 @@ import kotlinx.coroutines.flow.StateFlow
		* given mobile data subscription.
		*/
		interface DeviceBasedSatelliteRepository {
		/** The current status of satellite provisioning. If not false, we don't want to show an icon */
		val isSatelliteProvisioned: StateFlow<Boolean>

		/** See [SatelliteConnectionState] for available states */
		val connectionState: StateFlow<SatelliteConnectionState>

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/DeviceBasedSatelliteRepositorySwitcher.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,11 @@ constructor(
		}
		.stateIn(scope, SharingStarted.WhileSubscribed(), realImpl)

		override val isSatelliteProvisioned: StateFlow<Boolean> =
		activeRepo
		.flatMapLatest { it.isSatelliteProvisioned }
		.stateIn(scope, SharingStarted.WhileSubscribed(), realImpl.isSatelliteProvisioned.value)

		override val connectionState: StateFlow<SatelliteConnectionState> =
		activeRepo
		.flatMapLatest { it.connectionState }

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/demo/DemoDeviceBasedSatelliteRepository.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ constructor(
		) : DeviceBasedSatelliteRepository {
		private var demoCommandJob: Job? = null

		override val isSatelliteProvisioned = MutableStateFlow(true)
		override val connectionState = MutableStateFlow(SatelliteConnectionState.Unknown)
		override val signalStrength = MutableStateFlow(0)
		override val isSatelliteAllowedForCurrentLocation = MutableStateFlow(true)

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImpl.kt

+38 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.telephony.satellite.NtnSignalStrengthCallback
		import android.telephony.satellite.SatelliteManager
		import android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS
		import android.telephony.satellite.SatelliteModemStateCallback
		import android.telephony.satellite.SatelliteProvisionStateCallback
		import android.telephony.satellite.SatelliteSupportedStateCallback
		import androidx.annotation.VisibleForTesting
		import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
		@@ -337,6 +338,43 @@ constructor(
		}
		}

		override val isSatelliteProvisioned: StateFlow<Boolean> =
		satelliteSupport
		.whenSupported(
		supported = ::satelliteProvisioned,
		orElse = flowOf(false),
		retrySignal = telephonyProcessCrashedEvent,
		)
		.stateIn(scope, SharingStarted.WhileSubscribed(), false)

		private fun satelliteProvisioned(sm: SupportedSatelliteManager): Flow<Boolean> =
		conflatedCallbackFlow {
		val callback = SatelliteProvisionStateCallback { provisioned ->
		logBuffer.i {
		"onSatelliteProvisionStateChanged: " +
		if (provisioned) "provisioned" else "not provisioned"
		}
		trySend(provisioned)
		}

		var registered = false
		try {
		sm.registerForProvisionStateChanged(
		bgDispatcher.asExecutor(),
		callback,
		)
		registered = true
		} catch (e: Exception) {
		logBuffer.e("error registering for provisioning state callback", e)
		}

		awaitClose {
		if (registered) {
		sm.unregisterForProvisionStateChanged(callback)
		}
		}
		}

		/**
		* Signal that we should start polling [checkIsSatelliteAllowed]. We only need to poll if there
		* are active listeners to [isSatelliteAllowedForCurrentLocation]

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/domain/interactor/DeviceBasedSatelliteInteractor.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import com.android.systemui.statusbar.pipeline.satellite.data.DeviceBasedSatelli
		import com.android.systemui.statusbar.pipeline.satellite.shared.model.SatelliteConnectionState
		import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor
		import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
		import com.android.systemui.statusbar.policy.domain.interactor.DeviceProvisioningInteractor
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		@@ -45,7 +44,6 @@ class DeviceBasedSatelliteInteractor
		constructor(
		val repo: DeviceBasedSatelliteRepository,
		iconsInteractor: MobileIconsInteractor,
		deviceProvisioningInteractor: DeviceProvisioningInteractor,
		wifiInteractor: WifiInteractor,
		@Application scope: CoroutineScope,
		@DeviceBasedSatelliteInputLog private val logBuffer: LogBuffer,
		@@ -78,7 +76,7 @@ constructor(
		}
		.stateIn(scope, SharingStarted.WhileSubscribed(), 0)

		val isDeviceProvisioned: Flow<Boolean> = deviceProvisioningInteractor.isDeviceProvisioned
		val isSatelliteProvisioned = repo.isSatelliteProvisioned

		val isWifiActive: Flow<Boolean> =
		wifiInteractor.wifiNetwork.map { it is WifiNetworkModel.Active }