[SB][Wifi] Remove WIFI_TRACKER_LIB_FOR_WIFI_ICON flag and old repo. (7a0c941d) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		package com.android.systemui.statusbar.pipeline.wifi.data.repository

		import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryHelper.ACTIVITY_DEFAULT
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryViaTrackerLib.Companion.ACTIVITY_DEFAULT
		import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
		import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiScanEntry
		import kotlinx.coroutines.flow.MutableStateFlow

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

deleted100644 → 0

+0 −1323

File deleted.

Preview size limit exceeded, changes collapsed.

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -255,9 +255,6 @@ object Flags {
		val FILTER_PROVISIONING_NETWORK_SUBSCRIPTIONS =
		releasedFlag("filter_provisioning_network_subscriptions")

		// TODO(b/292533677): Tracking Bug
		val WIFI_TRACKER_LIB_FOR_WIFI_ICON = releasedFlag("wifi_tracker_lib_for_wifi_icon")

		// TODO(b/293863612): Tracking Bug
		@JvmField val INCOMPATIBLE_CHARGING_BATTERY_ICON =
		releasedFlag("incompatible_charging_battery_icon")

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt

+2 −48

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@ package com.android.systemui.statusbar.pipeline.dagger
		import android.net.wifi.WifiManager
		import com.android.systemui.CoreStartable
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.LogBufferFactory
		import com.android.systemui.log.table.TableLogBuffer
		@@ -52,11 +50,8 @@ import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStat
		import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.CollapsedStatusBarViewModelImpl
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepositoryDagger
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepositorySwitcher
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepositoryViaTrackerLibDagger
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.DisabledWifiRepository
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl
		import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryViaTrackerLib
		import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor
		import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl
		@@ -131,35 +126,15 @@ abstract class StatusBarPipelineModule {
		impl: CollapsedStatusBarViewBinderImpl
		): CollapsedStatusBarViewBinder

		@Binds
		@IntoMap
		@ClassKey(WifiRepositoryDagger::class)
		abstract fun bindWifiRepositoryDagger(impl: WifiRepositoryDagger): CoreStartable

		companion object {
		@Provides
		@SysUISingleton
		fun provideWifiRepositoryDagger(
		wifiManager: WifiManager?,
		disabledWifiRepository: DisabledWifiRepository,
		wifiRepositoryImplFactory: WifiRepositoryImpl.Factory,
		): WifiRepositoryDagger {
		// If we have a null [WifiManager], then the wifi repository should be permanently
		// disabled.
		return if (wifiManager == null) {
		disabledWifiRepository
		} else {
		wifiRepositoryImplFactory.create(wifiManager)
		}
		}

		@Provides
		@SysUISingleton
		fun provideWifiRepositoryViaTrackerLibDagger(
		fun provideRealWifiRepository(
		wifiManager: WifiManager?,
		disabledWifiRepository: DisabledWifiRepository,
		wifiRepositoryFromTrackerLibFactory: WifiRepositoryViaTrackerLib.Factory,
		): WifiRepositoryViaTrackerLibDagger {
		): RealWifiRepository {
		// If we have a null [WifiManager], then the wifi repository should be permanently
		// disabled.
		return if (wifiManager == null) {
		@@ -169,20 +144,6 @@ abstract class StatusBarPipelineModule {
		}
		}

		@Provides
		@SysUISingleton
		fun provideRealWifiRepository(
		wifiRepository: WifiRepositoryDagger,
		wifiRepositoryFromTrackerLib: WifiRepositoryViaTrackerLibDagger,
		flags: FeatureFlags,
		): RealWifiRepository {
		return if (flags.isEnabled(Flags.WIFI_TRACKER_LIB_FOR_WIFI_ICON)) {
		wifiRepositoryFromTrackerLib
		} else {
		wifiRepository
		}
		}

		@Provides
		@SysUISingleton
		@Named(FIRST_MOBILE_SUB_SHOWING_NETWORK_TYPE_ICON)
		@@ -194,13 +155,6 @@ abstract class StatusBarPipelineModule {
		}
		}

		@Provides
		@SysUISingleton
		@WifiInputLog
		fun provideWifiInputLogBuffer(factory: LogBufferFactory): LogBuffer {
		return factory.create("WifiInputLog", 50)
		}

		@Provides
		@SysUISingleton
		@WifiTrackerLibInputLog

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/WifiInputLog.kt

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.pipeline.dagger

		import javax.inject.Qualifier

		/** Wifi logs for inputs into the wifi pipeline. */
		@Qualifier
		@MustBeDocumented
		@kotlin.annotation.Retention(AnnotationRetention.RUNTIME)
		annotation class WifiInputLog