PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InternetPreferenceController V2 (6/n)

Browse Source 
Treat carrier merged Wi-Fi as cellular.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ie14c36f0f22c332319c097150b06cfeec97e946f
This commit is contained in:
Chaohui Wang
2024-06-12 18:28:04 +08:00
parent c5cc30f0c3
commit 52d15b6c34
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/InternetPreferenceRepository.kt
View File

@@ -18,6 +18,7 @@ package com.android.settings.network
import android.content.Context
import android.net.NetworkCapabilities
import android.net.wifi.WifiInfo
import android.net.wifi.WifiManager
import android.provider.Settings
import android.util.Log
@@ -68,6 +69,11 @@ class InternetPreferenceRepository(
hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
) {
val transportInfo = transportInfo
if (transportInfo is WifiInfo && transportInfo.isCarrierMerged) {
Log.i(TAG, "Detect a merged carrier Wi-Fi connected.")
return cellularDisplayInfoFlow()
}
for (transportType in transportTypes) {
when (transportType) {
NetworkCapabilities.TRANSPORT_WIFI -> return wifiDisplayInfoFlow()