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

Commit 283a1c15 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I387b9283,If02befcd into main 

* changes:
  [SB] Upgrade ConnectivityRepositoryImplTest to latest and greatest.
  [SB] Always check underlying wifi networks regardless of transport type.
parents 367842cf e6cc1563

packages/SystemUI/aconfig/systemui.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -379,6 +379,17 @@ flag { 
    }

}



flag {

    name: "status_bar_always_check_underlying_networks"

    namespace: "systemui"

    description: "For status bar connectivity UI, always check underlying networks for wifi and "

        "carrier merged information, regardless of the sepcified transport type"

    bug: "352162710"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "status_bar_stop_updating_window_height"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepository.kt

+6 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID 
import androidx.annotation.ArrayRes

import androidx.annotation.VisibleForTesting

import com.android.systemui.Dumpable

import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow

import com.android.systemui.Flags

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dump.DumpManager
@@ -47,6 +47,7 @@ import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnecti 
import com.android.systemui.statusbar.pipeline.shared.data.model.DefaultConnectionModel.Wifi

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

import com.android.systemui.tuner.TunerService

import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow

import java.io.PrintWriter

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope
@@ -252,7 +253,10 @@ constructor( 
            }

            // Only CELLULAR networks may have underlying wifi information that's relevant to SysUI,

            // so skip the underlying network check if it's not CELLULAR.

            if (!this.hasTransport(TRANSPORT_CELLULAR)) {

            if (

                !this.hasTransport(TRANSPORT_CELLULAR) &&

                    !Flags.statusBarAlwaysCheckUnderlyingNetworks()

            ) {

                return mainWifiInfo

            }

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/data/repository/ConnectivityRepositoryImplTest.kt

+110 −140

File changed.

Preview size limit exceeded, changes collapsed.