From d13a04f7c5cb43b9026a99ea27bc9125c5f5fb69 Mon Sep 17 00:00:00 2001 From: Caitlin Shkuratov Date: Tue, 7 Feb 2023 22:13:46 +0000 Subject: [PATCH] [SB Refactor] Make demo wifi's activity always non-null. Bug: 238425913 Test: `adb shell am broadcast -a com.android.systemui.demo -e command network -e wifi show -e level 2 -e activity in -e ssid someSsid` -> shows wifi icon with activity in Change-Id: Ia7eb62d6538218de4b2b37cfed37c3d8b1d6af37 --- .../wifi/data/repository/demo/DemoModeWifiDataSource.kt | 4 ++-- .../pipeline/wifi/data/repository/demo/DemoWifiRepository.kt | 4 +--- .../wifi/data/repository/demo/model/FakeWifiEventModel.kt | 4 +++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoModeWifiDataSource.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoModeWifiDataSource.kt index caac8fa2f2c3d..145c6db6ccbbf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoModeWifiDataSource.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoModeWifiDataSource.kt @@ -53,7 +53,7 @@ constructor( private fun Bundle.activeWifiEvent(): FakeWifiEventModel.Wifi { val level = getString("level")?.toInt() - val activity = getString("activity")?.toActivity() + val activity = getString("activity").toActivity() val ssid = getString("ssid") val validated = getString("fully").toBoolean() @@ -73,7 +73,7 @@ constructor( return FakeWifiEventModel.CarrierMerged(subId, level, numberOfLevels) } - private fun String.toActivity(): Int = + private fun String?.toActivity(): Int = when (this) { "inout" -> WifiManager.TrafficStateCallback.DATA_ACTIVITY_INOUT "in" -> WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt index e161b3e42d02c..08c09d6c8e2a6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt @@ -80,9 +80,7 @@ constructor( private fun processEnabledWifiState(event: FakeWifiEventModel.Wifi) { _isWifiEnabled.value = true _isWifiDefault.value = true - _wifiActivity.value = - event.activity?.toWifiDataActivityModel() - ?: DataActivityModel(hasActivityIn = false, hasActivityOut = false) + _wifiActivity.value = event.activity.toWifiDataActivityModel() _wifiNetwork.value = event.toWifiNetworkModel() } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/model/FakeWifiEventModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/model/FakeWifiEventModel.kt index 518f8ce66d2e4..4f5074259e27b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/model/FakeWifiEventModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/model/FakeWifiEventModel.kt @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model +import android.telephony.Annotation + /** * Model for demo wifi commands, ported from [NetworkControllerImpl] * @@ -24,7 +26,7 @@ package com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model sealed interface FakeWifiEventModel { data class Wifi( val level: Int?, - val activity: Int?, + @Annotation.DataActivityType val activity: Int, val ssid: String?, val validated: Boolean?, ) : FakeWifiEventModel