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

Merge "Disable W+ in QS." into sc-dev am: d003be9369

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

Change-Id: I07f2e5d7bfdb46bb9f21397276f0240183c4dd7c
This commit is contained in:
Ying Xu
2021-07-02 21:28:17 +00:00
committed by Automerger Merge Worker
parent 1943d7c240 d003be9369
commit b501817e9d
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
View File

@@ -32,7 +32,6 @@ import android.net.wifi.WifiNetworkScoreCache;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.provider.Settings; import android.provider.Settings;
import android.util.FeatureFlagUtils;
import com.android.settingslib.R; import com.android.settingslib.R;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
@@ -158,7 +157,7 @@ public class WifiStatusTracker {
private Network mDefaultNetwork = null; private Network mDefaultNetwork = null;
private NetworkCapabilities mDefaultNetworkCapabilities = null; private NetworkCapabilities mDefaultNetworkCapabilities = null;
private final Runnable mCallback; private final Runnable mCallback;
private final boolean mProviderModel; private final boolean mSupportMergedUi;
private WifiInfo mWifiInfo; private WifiInfo mWifiInfo;
public boolean enabled; public boolean enabled;
@@ -182,8 +181,7 @@ public class WifiStatusTracker {
mNetworkScoreManager = networkScoreManager; mNetworkScoreManager = networkScoreManager;
mConnectivityManager = connectivityManager; mConnectivityManager = connectivityManager;
mCallback = callback; mCallback = callback;
mProviderModel = FeatureFlagUtils.isEnabled( mSupportMergedUi = false;
mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
} }
public void setListening(boolean listening) { public void setListening(boolean listening) {
@@ -225,7 +223,7 @@ public class WifiStatusTracker {
} else { } else {
ssid = getValidSsid(mWifiInfo); ssid = getValidSsid(mWifiInfo);
} }
if (mProviderModel) { if (mSupportMergedUi) {
isCarrierMerged = mWifiInfo.isCarrierMerged(); isCarrierMerged = mWifiInfo.isCarrierMerged();
subId = mWifiInfo.getSubscriptionId(); subId = mWifiInfo.getSubscriptionId();
} }
@@ -257,7 +255,7 @@ public class WifiStatusTracker {
} else { } else {
ssid = getValidSsid(mWifiInfo); ssid = getValidSsid(mWifiInfo);
} }
if (mProviderModel) { if (mSupportMergedUi) {
isCarrierMerged = mWifiInfo.isCarrierMerged(); isCarrierMerged = mWifiInfo.isCarrierMerged();
subId = mWifiInfo.getSubscriptionId(); subId = mWifiInfo.getSubscriptionId();
} }

6
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java
View File

@@ -238,7 +238,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
mNetworkController.setNoNetworksAvailable(false); mNetworkController.setNoNetworksAvailable(false);
setWifiStateForVcn(true, testSsid); setWifiStateForVcn(true, testSsid);
setWifiLevelForVcn(0); setWifiLevelForVcn(0);
verifyLastMobileDataIndicatorsForVcn(true, 0, TelephonyIcons.ICON_CWF, false); verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][0]);
mNetworkController.setNoNetworksAvailable(true); mNetworkController.setNoNetworksAvailable(true);
for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) { for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) {
@@ -246,11 +246,11 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
setConnectivityViaCallbackInNetworkControllerForVcn( setConnectivityViaCallbackInNetworkControllerForVcn(
NetworkCapabilities.TRANSPORT_CELLULAR, true, true, mVcnTransportInfo); NetworkCapabilities.TRANSPORT_CELLULAR, true, true, mVcnTransportInfo);
verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, true); verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]);
setConnectivityViaCallbackInNetworkControllerForVcn( setConnectivityViaCallbackInNetworkControllerForVcn(
NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo); NetworkCapabilities.TRANSPORT_CELLULAR, false, true, mVcnTransportInfo);
verifyLastMobileDataIndicatorsForVcn(true, testLevel, TelephonyIcons.ICON_CWF, false); verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][testLevel]);
} }
} }