Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d13a04f7 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[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
parent 2def6f9a

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

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+1 −3
Original line number Diff line number Diff line
@@ -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()

    }

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/model/FakeWifiEventModel.kt

+3 −1
Original line number Diff line number Diff line
@@ -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