Merge "Fix the bug of "Connecting" is rarely appearing on Wi-Fi slice" (d4ab1496) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/slices/SliceBackgroundWorker.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ public abstract class SliceBackgroundWorker<E> implements Closeable {
		needNotify = true;
		}
		} else {
		needNotify = !results.equals(mCachedResults);
		needNotify = !areListsTheSame(results, mCachedResults);
		}

		if (needNotify) {
		@@ -155,6 +155,10 @@ public abstract class SliceBackgroundWorker<E> implements Closeable {
		}
		}

		protected boolean areListsTheSame(List<E> a, List<E> b) {
		return a.equals(b);
		}

		/**
		* Notify that data was updated and attempt to sync changes to the Slice.
		*/

src/com/android/settings/wifi/slice/WifiSlice.java

+35 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.graphics.PorterDuffColorFilter;
		import android.graphics.drawable.ColorDrawable;
		import android.graphics.drawable.Drawable;
		import android.net.NetworkInfo;
		import android.net.NetworkInfo.State;
		import android.net.Uri;
		import android.net.wifi.WifiInfo;
		import android.net.wifi.WifiManager;
		@@ -355,7 +356,6 @@ public class WifiSlice implements CustomSliceable {

		@Override
		public void onConnectedChanged() {
		notifySliceChange();
		}

		@Override
		@@ -370,10 +370,43 @@ public class WifiSlice implements CustomSliceable {
		final List<AccessPoint> resultList = new ArrayList<>();
		for (AccessPoint ap : accessPoints) {
		if (ap.isReachable()) {
		resultList.add(ap);
		resultList.add(clone(ap));
		if (resultList.size() >= DEFAULT_EXPANDED_ROW_COUNT) {
		break;
		}
		}
		}
		updateResults(resultList);
		}

		private AccessPoint clone(AccessPoint accessPoint) {
		final Bundle savedState = new Bundle();
		accessPoint.saveWifiState(savedState);
		return new AccessPoint(mContext, savedState);
		}

		@Override
		protected boolean areListsTheSame(List<AccessPoint> a, List<AccessPoint> b) {
		if (!a.equals(b)) {
		return false;
		}

		// compare access point states one by one
		final int listSize = a.size();
		for (int i = 0; i < listSize; i++) {
		if (getState(a.get(i)) != getState(b.get(i))) {
		return false;
		}
		}
		return true;
		}

		private State getState(AccessPoint accessPoint) {
		final NetworkInfo networkInfo = accessPoint.getNetworkInfo();
		if (networkInfo != null) {
		return networkInfo.getState();
		}
		return null;
		}
		}
		}

tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java

+37 −3

Original line number	Diff line number	Diff line
		@@ -34,8 +34,10 @@ import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.net.NetworkInfo;
		import android.net.NetworkInfo.State;
		import android.net.Uri;
		import android.net.wifi.WifiManager;
		import android.os.Bundle;

		import androidx.core.graphics.drawable.IconCompat;
		import androidx.slice.Slice;
		@@ -61,6 +63,7 @@ import org.robolectric.annotation.Implementation;
		import org.robolectric.annotation.Implements;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;

		@RunWith(RobolectricTestRunner.class)
		@@ -253,11 +256,42 @@ public class WifiSliceTest {
		verify(mResolver).notifyChange(WIFI_SLICE_URI, null);
		}

		private AccessPoint createAccessPoint(String name, State state) {
		final NetworkInfo info = mock(NetworkInfo.class);
		doReturn(state).when(info).getState();

		final Bundle savedState = new Bundle();
		savedState.putString("key_ssid", name);
		savedState.putParcelable("key_networkinfo", info);
		return new AccessPoint(mContext, savedState);
		}

		@Test
		public void onConnectedChanged_shouldNotifyChange() {
		mWifiScanWorker.onConnectedChanged();
		public void SliceAccessPoint_sameState_shouldBeTheSame() {
		final AccessPoint ap1 = createAccessPoint(AP1_NAME, State.CONNECTED);
		final AccessPoint ap2 = createAccessPoint(AP1_NAME, State.CONNECTED);

		verify(mResolver).notifyChange(WIFI_SLICE_URI, null);
		assertThat(mWifiScanWorker.areListsTheSame(Arrays.asList(ap1), Arrays.asList(ap2)))
		.isTrue();
		}

		@Test
		public void SliceAccessPoint_differentState_shouldBeDifferent() {
		final AccessPoint ap1 = createAccessPoint(AP1_NAME, State.CONNECTING);
		final AccessPoint ap2 = createAccessPoint(AP1_NAME, State.CONNECTED);

		assertThat(mWifiScanWorker.areListsTheSame(Arrays.asList(ap1), Arrays.asList(ap2)))
		.isFalse();
		}
		@Test
		public void SliceAccessPoint_differentLength_shouldBeDifferent() {
		final AccessPoint ap1 = createAccessPoint(AP1_NAME, State.CONNECTED);
		final AccessPoint ap2 = createAccessPoint(AP1_NAME, State.CONNECTED);
		final List<AccessPoint> list = new ArrayList<>();
		list.add(ap1);
		list.add(ap2);

		assertThat(mWifiScanWorker.areListsTheSame(list, Arrays.asList(ap1))).isFalse();
		}

		@Implements(SliceBackgroundWorker.class)