Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert^2 "Add @SysUISingleton to repository switcher classes"

Browse Source 
The Mobile and WiFi repository switcher classes never got the annotation
to be created as a SysUISingleton. This is probably a mistake caused
by the way we had been providing them; By using a @Binds method on the
StatusBarPipelineModule, it was not immediately obvious that the classes
were not singletons. But believe me, they should be singletons.

Test: manually determined that there is only 1 Mobile and Wifi switcher
instantiated
Test: CarrierTextManagerLog gets current info when airplane mode
switches
Test: manually verified that the "Wi-Fi Calling" text shows when in
airplane mode
Fixes: 278254374

Change-Id: Idd766a5378d8deebe50bafe1d564635187ab30ee
This commit is contained in:
Evan Laird
2023-05-10 16:37:13 +00:00
parent 507a417f62
commit fefb9a945a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileRepositorySwitcher.kt
View File

@@ -21,6 +21,7 @@ import androidx.annotation.VisibleForTesting
import com.android.settingslib.SignalIcon
import com.android.settingslib.mobile.MobileMappings
import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Application
import com.android.systemui.demomode.DemoMode
import com.android.systemui.demomode.DemoModeController
@@ -62,6 +63,7 @@ import kotlinx.coroutines.flow.stateIn
*/
@Suppress("EXPERIMENTAL_IS_NOT_ENABLED")
@OptIn(ExperimentalCoroutinesApi::class)
@SysUISingleton
class MobileRepositorySwitcher
@Inject
constructor(

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcher.kt
View File

@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.pipeline.wifi.data.repository
import android.os.Bundle
import androidx.annotation.VisibleForTesting
import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Application
import com.android.systemui.demomode.DemoMode
import com.android.systemui.demomode.DemoModeController
@@ -54,6 +55,7 @@ import kotlinx.coroutines.flow.stateIn
*/
@Suppress("EXPERIMENTAL_IS_NOT_ENABLED")
@OptIn(ExperimentalCoroutinesApi::class)
@SysUISingleton
class WifiRepositorySwitcher
@Inject
constructor(