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

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -73,11 +73,7 @@ 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)
		it.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		}
		private val featureFlags = FakeFeatureFlagsClassic().also { it.set(Flags.INSTANT_TETHER, true) }

		private val testDispatcher = UnconfinedTestDispatcher()
		private val testScope = TestScope(testDispatcher)

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -203,9 +203,6 @@ object Flags {
		// TODO(b/293585143): Tracking Bug
		val INSTANT_TETHER = releasedFlag("instant_tether")

		// TODO(b/294588085): Tracking Bug
		val WIFI_SECONDARY_NETWORKS = releasedFlag("wifi_secondary_networks")

		// 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

+6 −10

Original line number	Diff line number	Diff line
		@@ -109,16 +109,11 @@ constructor(
		val connectedEntry = wifiPickerTracker.mergedOrPrimaryConnection
		logOnWifiEntriesChanged(connectedEntry)

		val activeNetworks = wifiPickerTracker?.activeWifiEntries ?: emptyList()
		val secondaryNetworks =
		if (featureFlags.isEnabled(Flags.WIFI_SECONDARY_NETWORKS)) {
		val activeNetworks =
		wifiPickerTracker?.activeWifiEntries ?: emptyList()
		activeNetworks
		.filter { it != connectedEntry && !it.isPrimaryNetwork }
		.map { it.toWifiNetworkModel() }
		} else {
		emptyList()
		}

		// [WifiPickerTracker.connectedWifiEntry] will return the same instance
		// but with updated internals. For example, when its validation status
		@@ -130,7 +125,8 @@ constructor(
		// into our internal model immediately. [toWifiNetworkModel] always
		// returns a new instance, so the flow is guaranteed to emit.
		send(
		newPrimaryNetwork = connectedEntry?.toPrimaryWifiNetworkModel()
		newPrimaryNetwork =
		connectedEntry?.toPrimaryWifiNetworkModel()
		?: WIFI_NETWORK_DEFAULT,
		newSecondaryNetworks = secondaryNetworks,
		newIsDefault = connectedEntry?.isDefaultNetwork ?: false,

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() {
		FakeFeatureFlagsClassic().also {
		it.set(Flags.ROAMING_INDICATOR_VIA_DISPLAY_INFO, true)
		it.set(Flags.INSTANT_TETHER, true)
		it.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		}

		private lateinit var connectionFactory: MobileConnectionRepositoryImpl.Factory

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

+0 −25

Original line number	Diff line number	Diff line
		@@ -104,7 +104,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Before
		fun setUp() {
		featureFlags.set(Flags.INSTANT_TETHER, false)
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, false)
		whenever(wifiPickerTrackerFactory.create(any(), capture(callbackCaptor), any()))
		.thenReturn(wifiPickerTracker)
		}
		@@ -826,7 +825,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_activeEntriesEmpty_isEmpty() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		whenever(wifiPickerTracker.activeWifiEntries).thenReturn(listOf())
		@@ -839,7 +837,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_oneActiveEntry_hasOne() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val wifiEntry = mock<WifiEntry>()
		@@ -853,7 +850,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_multipleActiveEntries_hasMultiple() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val wifiEntry1 = mock<WifiEntry>()
		@@ -868,7 +864,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_mapsToInactive() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val inactiveEntry =
		@@ -884,7 +879,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_mapsToActive() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val activeEntry = mock<WifiEntry>().apply { whenever(this.level).thenReturn(2) }
		@@ -900,7 +894,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_mapsToCarrierMerged() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val carrierMergedEntry =
		@@ -917,7 +910,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_mapsMultipleInOrder() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val activeEntry = mock<WifiEntry>().apply { whenever(this.level).thenReturn(2) }
		@@ -937,7 +929,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_filtersOutConnectedEntry() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val connectedEntry = mock<WifiEntry>().apply { whenever(this.level).thenReturn(1) }
		@@ -959,7 +950,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_noConnectedEntry_hasAllActiveEntries() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val secondaryEntry1 = mock<WifiEntry>().apply { whenever(this.level).thenReturn(2) }
		@@ -978,7 +968,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		@Test
		fun secondaryNetworks_filtersOutPrimaryNetwork() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, true)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val primaryEntry =
		@@ -1000,20 +989,6 @@ class WifiRepositoryImplTest : SysuiTestCase() {
		assertThat((latest!![1] as WifiNetworkModel.Active).level).isEqualTo(3)
		}

		@Test
		fun secondaryNetworks_flagOff_noNetworks() =
		testScope.runTest {
		featureFlags.set(Flags.WIFI_SECONDARY_NETWORKS, false)
		val latest by collectLastValue(underTest.secondaryNetworks)

		val wifiEntry = mock<WifiEntry>()
		whenever(wifiPickerTracker.activeWifiEntries).thenReturn(listOf(wifiEntry))

		getCallback().onWifiEntriesChanged()

		assertThat(latest).isEmpty()
		}

		@Test
		fun isWifiConnectedWithValidSsid_inactiveNetwork_false() =
		testScope.runTest {