Merge "[SB][Wifi] Remove launched INSTANT_TETHER flag." into main (44141021) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcherTest.kt

+0 −4

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.demomode.DemoMode
		import com.android.systemui.demomode.DemoModeController
		import com.android.systemui.flags.FakeFeatureFlagsClassic
		import com.android.systemui.flags.Flags
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.statusbar.connectivity.WifiPickerTrackerFactory
		@@ -73,7 +71,6 @@ class WifiRepositorySwitcherTest : SysuiTestCase() {
		private val demoModelFlow = MutableStateFlow<FakeWifiEventModel?>(null)

		private val mainExecutor = FakeExecutor(FakeSystemClock())
		private val featureFlags = FakeFeatureFlagsClassic().also { it.set(Flags.INSTANT_TETHER, true) }

		private val testDispatcher = UnconfinedTestDispatcher()
		private val testScope = TestScope(testDispatcher)
		@@ -89,7 +86,6 @@ class WifiRepositorySwitcherTest : SysuiTestCase() {

		realImpl =
		WifiRepositoryImpl(
		featureFlags,
		testScope.backgroundScope,
		mainExecutor,
		testDispatcher,

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -200,9 +200,6 @@ object Flags {
		@JvmField
		val INCOMPATIBLE_CHARGING_BATTERY_ICON = releasedFlag("incompatible_charging_battery_icon")

		// TODO(b/293585143): Tracking Bug
		val INSTANT_TETHER = releasedFlag("instant_tether")

		// TODO(b/290676905): Tracking Bug
		val NEW_SHADE_CARRIER_GROUP_MOBILE_ICONS = releasedFlag("new_shade_carrier_group_mobile_icons")

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt

+1 −8

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@ import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.core.LogLevel
		import com.android.systemui.log.table.TableLogBuffer
		@@ -75,7 +73,6 @@ import kotlinx.coroutines.flow.stateIn
		class WifiRepositoryImpl
		@Inject
		constructor(
		featureFlags: FeatureFlags,
		@Application private val scope: CoroutineScope,
		@Main private val mainExecutor: Executor,
		@Background private val bgDispatcher: CoroutineDispatcher,
		@@ -90,8 +87,6 @@ constructor(
		mainExecutor.execute { it.currentState = Lifecycle.State.CREATED }
		}

		private val isInstantTetherEnabled = featureFlags.isEnabled(Flags.INSTANT_TETHER)

		private var wifiPickerTracker: WifiPickerTracker? = null

		private val wifiPickerTrackerInfo: StateFlow<WifiPickerTrackerInfo> = run {
		@@ -273,7 +268,7 @@ constructor(
		}

		val hotspotDeviceType =
		if (isInstantTetherEnabled && this is HotspotNetworkEntry) {
		if (this is HotspotNetworkEntry) {
		this.deviceType.toHotspotDeviceType()
		} else {
		WifiNetworkModel.HotspotDeviceType.NONE
		@@ -404,7 +399,6 @@ constructor(
		class Factory
		@Inject
		constructor(
		private val featureFlags: FeatureFlags,
		@Application private val scope: CoroutineScope,
		@Main private val mainExecutor: Executor,
		@Background private val bgDispatcher: CoroutineDispatcher,
		@@ -414,7 +408,6 @@ constructor(
		) {
		fun create(wifiManager: WifiManager): WifiRepositoryImpl {
		return WifiRepositoryImpl(
		featureFlags,
		scope,
		mainExecutor,
		bgDispatcher,

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt

+1 −5

Original line number	Diff line number	Diff line
		@@ -106,10 +106,7 @@ import org.mockito.kotlin.whenever
		class MobileConnectionsRepositoryTest : SysuiTestCase() {

		private val flags =
		FakeFeatureFlagsClassic().also {
		it.set(Flags.ROAMING_INDICATOR_VIA_DISPLAY_INFO, true)
		it.set(Flags.INSTANT_TETHER, true)
		}
		FakeFeatureFlagsClassic().also { it.set(Flags.ROAMING_INDICATOR_VIA_DISPLAY_INFO, true) }

		private lateinit var connectionFactory: MobileConnectionRepositoryImpl.Factory
		private lateinit var carrierMergedFactory: CarrierMergedConnectionRepository.Factory
		@@ -188,7 +185,6 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() {

		wifiRepository =
		WifiRepositoryImpl(
		flags,
		testScope.backgroundScope,
		mainExecutor,
		testDispatcher,

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt

+0 −30

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@ import android.testing.TestableLooper
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.statusbar.connectivity.WifiPickerTrackerFactory
		@@ -76,7 +74,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		// inside each test case without needing to manually recreate the repository.
		private val underTest: WifiRepositoryImpl by lazy {
		WifiRepositoryImpl(
		featureFlags,
		testScope.backgroundScope,
		executor,
		dispatcher,
		@@ -89,7 +86,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {

		private val executor = FakeExecutor(FakeSystemClock())
		private val logger = LogBuffer("name", maxSize = 100, logcatEchoTracker = mock())
		private val featureFlags = FakeFeatureFlags()
		private val tableLogger = mock<TableLogBuffer>()
		private val wifiManager =
		mock<WifiManager>().apply { whenever(this.maxSignalLevel).thenReturn(10) }
		@@ -103,7 +99,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {

		@Before
		fun setUp() {
		featureFlags.set(Flags.INSTANT_TETHER, false)
		whenever(wifiPickerTrackerFactory.create(any(), capture(callbackCaptor), any()))
		.thenReturn(wifiPickerTracker)
		}
		@@ -393,7 +388,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun wifiNetwork_notHotspot_none() =
		testScope.runTest {
		featureFlags.set(Flags.INSTANT_TETHER, true)
		val latest by collectLastValue(underTest.wifiNetwork)

		val wifiEntry =
		@@ -408,7 +402,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun wifiNetwork_hotspot_unknown() =
		testScope.runTest {
		featureFlags.set(Flags.INSTANT_TETHER, true)
		val latest by collectLastValue(underTest.wifiNetwork)

		val wifiEntry = createHotspotWithType(NetworkProviderInfo.DEVICE_TYPE_UNKNOWN)
		@@ -422,7 +415,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun wifiNetwork_hotspot_phone() =
		testScope.runTest {
		featureFlags.set(Flags.INSTANT_TETHER, true)
		val latest by collectLastValue(underTest.wifiNetwork)

		val wifiEntry = createHotspotWithType(NetworkProviderInfo.DEVICE_TYPE_PHONE)
		@@ -436,7 +428,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun wifiNetwork_hotspot_tablet() =
		testScope.runTest {
		featureFlags.set(Flags.INSTANT_TETHER, true)
		val latest by collectLastValue(underTest.wifiNetwork)

		val wifiEntry = createHotspotWithType(NetworkProviderInfo.DEVICE_TYPE_TABLET)
		@@ -450,7 +441,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun wifiNetwork_hotspot_laptop() =
		testScope.runTest {
		featureFlags.set(Flags.INSTANT_TETHER, true)
		val latest by collectLastValue(underTest.wifiNetwork)

		val wifiEntry = createHotspotWithType(NetworkProviderInfo.DEVICE_TYPE_LAPTOP)
		@@ -464,7 +454,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun wifiNetwork_hotspot_watch() =
		testScope.runTest {
		featureFlags.set(Flags.INSTANT_TETHER, true)
		val latest by collectLastValue(underTest.wifiNetwork)

		val wifiEntry = createHotspotWithType(NetworkProviderInfo.DEVICE_TYPE_WATCH)
		@@ -478,7 +467,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun wifiNetwork_hotspot_auto() =
		testScope.runTest {
		featureFlags.set(Flags.INSTANT_TETHER, true)
		val latest by collectLastValue(underTest.wifiNetwork)

		val wifiEntry = createHotspotWithType(NetworkProviderInfo.DEVICE_TYPE_AUTO)
		@@ -492,7 +480,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun wifiNetwork_hotspot_invalid() =
		testScope.runTest {
		featureFlags.set(Flags.INSTANT_TETHER, true)
		val latest by collectLastValue(underTest.wifiNetwork)

		val wifiEntry = createHotspotWithType(1234)
		@@ -503,23 +490,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		.isEqualTo(WifiNetworkModel.HotspotDeviceType.INVALID)
		}

		@Test
		fun wifiNetwork_hotspot_flagOff_valueNotUsed() =
		testScope.runTest {
		// WHEN the flag is off
		featureFlags.set(Flags.INSTANT_TETHER, false)

		val latest by collectLastValue(underTest.wifiNetwork)

		val wifiEntry = createHotspotWithType(NetworkProviderInfo.DEVICE_TYPE_WATCH)
		whenever(wifiPickerTracker.connectedWifiEntry).thenReturn(wifiEntry)
		getCallback().onWifiEntriesChanged()

		// THEN NONE is always used, even if the wifi entry does have a hotspot device type
		assertThat((latest as WifiNetworkModel.Active).hotspotDeviceType)
		.isEqualTo(WifiNetworkModel.HotspotDeviceType.NONE)
		}

		@Test
		fun wifiNetwork_isCarrierMerged_flowHasCarrierMerged() =
		testScope.runTest {