Merge "[Provider Model] Reduce WiFi list in airplane mode (QS Internet Dialog)" into sc-v2-dev (4e9facf9) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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);