Merge changes Ib0a75bcb,I0169622c into udc-dev am: 1ee0fb9a5f (8510b8b0) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,15 @@ interface WifiRepository {

		/** Observable for the current wifi network activity. */
		val wifiActivity: StateFlow<DataActivityModel>

		/**
		* Returns true if the device is currently connected to a wifi network with a valid SSID and
		* false otherwise.
		*/
		fun isWifiConnectedWithValidSsid(): Boolean {
		val currentNetwork = wifiNetwork.value
		return currentNetwork is WifiNetworkModel.Active && currentNetwork.hasValidSsid()
		}
		}

		/**

+1 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.statusbar.pipeline.wifi.domain.interactor

		import android.net.wifi.WifiManager
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot
		import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
		@@ -76,7 +75,7 @@ constructor(
		when {
		info.isPasspointAccessPoint \|\| info.isOnlineSignUpForPasspointAccessPoint ->
		info.passpointProviderFriendlyName
		info.ssid != WifiManager.UNKNOWN_SSID -> info.ssid
		info.hasValidSsid() -> info.ssid
		else -> null
		}
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.statusbar.pipeline.wifi.shared.model

		import android.net.wifi.WifiManager.UNKNOWN_SSID
		import android.telephony.SubscriptionManager
		import androidx.annotation.VisibleForTesting
		import com.android.systemui.log.table.Diffable
		@@ -223,6 +224,11 @@ sealed class WifiNetworkModel : Diffable<WifiNetworkModel> {
		}
		}

		/** Returns true if this network has a valid SSID and false otherwise. */
		fun hasValidSsid(): Boolean {
		return ssid != null && ssid != UNKNOWN_SSID
		}

		override fun logDiffs(prevVal: WifiNetworkModel, row: TableRowLogger) {
		if (prevVal !is Active) {
		logFull(row)

+196 −61

File changed.

Preview size limit exceeded, changes collapsed.

+37 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.statusbar.pipeline.wifi.shared.model

		import android.net.wifi.WifiManager.UNKNOWN_SSID
		import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		@@ -50,6 +51,42 @@ class WifiNetworkModelTest : SysuiTestCase() {
		WifiNetworkModel.CarrierMerged(NETWORK_ID, INVALID_SUBSCRIPTION_ID, 1)
		}

		@Test
		fun active_hasValidSsid_nullSsid_false() {
		val network =
		WifiNetworkModel.Active(
		NETWORK_ID,
		level = MAX_VALID_LEVEL,
		ssid = null,
		)

		assertThat(network.hasValidSsid()).isFalse()
		}

		@Test
		fun active_hasValidSsid_unknownSsid_false() {
		val network =
		WifiNetworkModel.Active(
		NETWORK_ID,
		level = MAX_VALID_LEVEL,
		ssid = UNKNOWN_SSID,
		)

		assertThat(network.hasValidSsid()).isFalse()
		}

		@Test
		fun active_hasValidSsid_validSsid_true() {
		val network =
		WifiNetworkModel.Active(
		NETWORK_ID,
		level = MAX_VALID_LEVEL,
		ssid = "FakeSsid",
		)

		assertThat(network.hasValidSsid()).isTrue()
		}

		// Non-exhaustive logDiffs test -- just want to make sure the logging logic isn't totally broken

		@Test