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

Commit cbdc76f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ieb73c357,I7f5bc07b,I01b33b24,I873e57bf,I8de76ad5 into tm-qpr-dev am: b9115ca0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20855887



Change-Id: I90ca359eaa83fc54e8a547b1f4a841b031bced64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 495a2cf4 b9115ca0

packages/SystemUI/ktfmt_includes.txt

+0 −1
Original line number Diff line number Diff line
@@ -460,7 +460,6 @@ 
-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLogger.kt

-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/model/WifiActivityModel.kt

-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/model/WifiNetworkModel.kt

-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt

-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractor.kt

-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/WifiConstants.kt

-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiView.kt

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

+20 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


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.log.table.TableLogBuffer
@@ -35,8 +36,11 @@ import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy 
import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxyImpl

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl

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.WifiRepositorySwitcher

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.domain.interactor.WifiInteractor

import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl

import dagger.Binds
@@ -78,9 +82,23 @@ abstract class StatusBarPipelineModule { 
    @ClassKey(MobileUiAdapter::class)

    abstract fun bindFeature(impl: MobileUiAdapter): CoreStartable



    @Module

    companion object {

        @JvmStatic

        @Provides

        @SysUISingleton

        fun provideRealWifiRepository(

            wifiManager: WifiManager?,

            disabledWifiRepository: DisabledWifiRepository,

            wifiRepositoryImplFactory: WifiRepositoryImpl.Factory,

        ): RealWifiRepository {

            // 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

        @WifiTableLog
@@ -88,7 +106,6 @@ abstract class StatusBarPipelineModule { 
            return factory.create("WifiTableLog", 100)

        }



        @JvmStatic

        @Provides

        @SysUISingleton

        @AirplaneTableLog

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/ResolvedNetworkType.kt

+0 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.pipeline.mobile.data.model



import android.telephony.Annotation.NetworkType

import android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy



/**
@@ -26,21 +25,17 @@ import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy 
 * methods on [MobileMappingsProxy] to generate an icon lookup key.

 */

sealed interface ResolvedNetworkType {

    @NetworkType val type: Int

    val lookupKey: String



    object UnknownNetworkType : ResolvedNetworkType {

        override val type: Int = NETWORK_TYPE_UNKNOWN

        override val lookupKey: String = "unknown"

    }



    data class DefaultNetworkType(

        @NetworkType override val type: Int,

        override val lookupKey: String,

    ) : ResolvedNetworkType



    data class OverrideNetworkType(

        @NetworkType override val type: Int,

        override val lookupKey: String,

    ) : ResolvedNetworkType

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionRepository.kt

+9 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.pipeline.mobile.data.repository



import android.telephony.SubscriptionInfo

import android.telephony.SubscriptionManager

import android.telephony.TelephonyCallback

import android.telephony.TelephonyManager

import com.android.systemui.log.table.TableLogBuffer
@@ -52,13 +51,12 @@ interface MobileConnectionRepository { 
     * listener + model.

     */

    val connectionInfo: Flow<MobileConnectionModel>



    /** The total number of levels. Used with [SignalDrawable]. */

    val numberOfLevels: StateFlow<Int>



    /** Observable tracking [TelephonyManager.isDataConnectionAllowed] */

    val dataEnabled: StateFlow<Boolean>

    /**

     * True if this connection represents the default subscription per

     * [SubscriptionManager.getDefaultDataSubscriptionId]

     */

    val isDefaultDataSubscription: StateFlow<Boolean>



    /**

     * See [TelephonyManager.getCdmaEnhancedRoamingIndicatorDisplayNumber]. This bit only matters if
@@ -70,4 +68,9 @@ interface MobileConnectionRepository { 


    /** The service provider name for this network connection, or the default name */

    val networkName: StateFlow<NetworkNameModel>



    companion object {

        /** The default number of levels to use for [numberOfLevels]. */

        const val DEFAULT_NUM_LEVELS = 4

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/MobileConnectionsRepository.kt

+0 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.pipeline.mobile.data.repository 


import android.provider.Settings

import android.telephony.CarrierConfigManager

import android.telephony.SubscriptionManager

import com.android.settingslib.SignalIcon.MobileIconGroup

import com.android.settingslib.mobile.MobileMappings

import com.android.settingslib.mobile.MobileMappings.Config
@@ -38,9 +37,6 @@ interface MobileConnectionsRepository { 
    /** Observable for the subscriptionId of the current mobile data connection */

    val activeMobileDataSubscriptionId: StateFlow<Int>



    /** Tracks [SubscriptionManager.getDefaultDataSubscriptionId] */

    val defaultDataSubId: StateFlow<Int>



    /** The current connectivity status for the default mobile network connection */

    val defaultMobileNetworkConnectivity: StateFlow<MobileConnectivityModel>