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

Merge "[Provider Model] Reduce WiFi list in airplane mode (QS Internet Dialog)" into sc-v2-dev am: 4e9facf967

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

Change-Id: Ifd6c945b489217863617233ba3be07ea0fb34c16
This commit is contained in:
TreeHugger Robot
2021-12-08 13:54:50 +00:00
committed by Automerger Merge Worker
parent 1cb7dbffd1 4e9facf967
commit 42dfae7fd9
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java
View File

@@ -892,7 +892,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi
if (mHasEthernet) { if (mHasEthernet) {
count -= 1; count -= 1;
} }
if (hasActiveSubId()) { if (hasActiveSubId() || isCarrierNetworkActive()) {
count -= 1; count -= 1;
} }
if (count > accessPoints.size()) { if (count > accessPoints.size()) {

30
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java
View File

@@ -540,6 +540,36 @@ public class InternetDialogControllerTest extends SysuiTestCase {
verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry); verify(mInternetDialogCallback).onAccessPointsChanged(mWifiEntries, mConnectedEntry);
} }
@Test
public void onAccessPointsChanged_oneCarrierWifiAndFourOthers_callbackCutMore() {
reset(mInternetDialogCallback);
fakeAirplaneModeEnabled(true);
when(mMergedCarrierEntry.isDefaultNetwork()).thenReturn(true);
mAccessPoints.clear();
mAccessPoints.add(mWifiEntry1);
mAccessPoints.add(mWifiEntry2);
mAccessPoints.add(mWifiEntry3);
mAccessPoints.add(mWifiEntry4);
mInternetDialogController.onAccessPointsChanged(mAccessPoints);
mWifiEntries.clear();
mWifiEntries.add(mWifiEntry1);
mWifiEntries.add(mWifiEntry2);
mWifiEntries.add(mWifiEntry3);
verify(mInternetDialogCallback)
.onAccessPointsChanged(mWifiEntries, null /* connectedEntry */);
// Turn off airplane mode to has carrier WiFi, then Wi-Fi entries will keep the same.
reset(mInternetDialogCallback);
fakeAirplaneModeEnabled(false);
mInternetDialogController.onAccessPointsChanged(mAccessPoints);
verify(mInternetDialogCallback)
.onAccessPointsChanged(mWifiEntries, null /* connectedEntry */);
}
@Test @Test
public void onAccessPointsChanged_fourWifiEntries_callbackCutMore() { public void onAccessPointsChanged_fourWifiEntries_callbackCutMore() {
reset(mInternetDialogCallback); reset(mInternetDialogCallback);