Merge "Remove untrusted network flag from suggestion" into rvc-dev am: 81eabccd8c (335b333e) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiNetworkSuggestion.java

+5 −18

Original line number	Diff line number	Diff line
		@@ -685,8 +685,7 @@ public final class WifiNetworkSuggestion implements Parcelable {
		mIsAppInteractionRequired,
		mIsUserInteractionRequired,
		mIsSharedWithUser,
		mIsInitialAutojoinEnabled,
		mIsNetworkUntrusted);
		mIsInitialAutojoinEnabled);
		}
		}

		@@ -729,13 +728,6 @@ public final class WifiNetworkSuggestion implements Parcelable {
		*/
		public final boolean isInitialAutoJoinEnabled;

		/**
		* Whether this network will be brought up as untrusted (TRUSTED capability bit removed).
		* @hide
		*/
		public final boolean isNetworkUntrusted;


		/** @hide */
		public WifiNetworkSuggestion() {
		this.wifiConfiguration = new WifiConfiguration();
		@@ -744,7 +736,6 @@ public final class WifiNetworkSuggestion implements Parcelable {
		this.isUserInteractionRequired = false;
		this.isUserAllowedToManuallyConnect = true;
		this.isInitialAutoJoinEnabled = true;
		this.isNetworkUntrusted = false;
		}

		/** @hide */
		@@ -753,8 +744,7 @@ public final class WifiNetworkSuggestion implements Parcelable {
		boolean isAppInteractionRequired,
		boolean isUserInteractionRequired,
		boolean isUserAllowedToManuallyConnect,
		boolean isInitialAutoJoinEnabled,
		boolean isNetworkUntrusted) {
		boolean isInitialAutoJoinEnabled) {
		checkNotNull(networkConfiguration);
		this.wifiConfiguration = networkConfiguration;
		this.passpointConfiguration = passpointConfiguration;
		@@ -763,7 +753,6 @@ public final class WifiNetworkSuggestion implements Parcelable {
		this.isUserInteractionRequired = isUserInteractionRequired;
		this.isUserAllowedToManuallyConnect = isUserAllowedToManuallyConnect;
		this.isInitialAutoJoinEnabled = isInitialAutoJoinEnabled;
		this.isNetworkUntrusted = isNetworkUntrusted;
		}

		public static final @NonNull Creator<WifiNetworkSuggestion> CREATOR =
		@@ -776,8 +765,7 @@ public final class WifiNetworkSuggestion implements Parcelable {
		in.readBoolean(), // isAppInteractionRequired
		in.readBoolean(), // isUserInteractionRequired
		in.readBoolean(), // isSharedCredentialWithUser
		in.readBoolean(), // isAutojoinEnabled
		in.readBoolean()
		in.readBoolean() // isAutojoinEnabled
		);
		}

		@@ -800,7 +788,6 @@ public final class WifiNetworkSuggestion implements Parcelable {
		dest.writeBoolean(isUserInteractionRequired);
		dest.writeBoolean(isUserAllowedToManuallyConnect);
		dest.writeBoolean(isInitialAutoJoinEnabled);
		dest.writeBoolean(isNetworkUntrusted);
		}

		@Override
		@@ -843,7 +830,7 @@ public final class WifiNetworkSuggestion implements Parcelable {
		.append(", isUserInteractionRequired=").append(isUserInteractionRequired)
		.append(", isCredentialSharedWithUser=").append(isUserAllowedToManuallyConnect)
		.append(", isInitialAutoJoinEnabled=").append(isInitialAutoJoinEnabled)
		.append(", isUnTrusted=").append(isNetworkUntrusted)
		.append(", isUnTrusted=").append(!wifiConfiguration.trusted)
		.append(" ]");
		return sb.toString();
		}
		@@ -934,7 +921,7 @@ public final class WifiNetworkSuggestion implements Parcelable {

		/** @see Builder#setUntrusted(boolean) */
		public boolean isUntrusted() {
		return isNetworkUntrusted;
		return !wifiConfiguration.trusted;
		}

		/**

wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -532,7 +532,7 @@ public class WifiNetworkSuggestionTest {
		configuration.BSSID = TEST_BSSID;
		configuration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
		WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion(
		configuration, null, false, true, true, true, false);
		configuration, null, false, true, true, true);

		Parcel parcelW = Parcel.obtain();
		suggestion.writeToParcel(parcelW, 0);
		@@ -603,14 +603,14 @@ public class WifiNetworkSuggestionTest {
		configuration.BSSID = TEST_BSSID;
		configuration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
		WifiNetworkSuggestion suggestion =
		new WifiNetworkSuggestion(configuration, null, true, false, true, true, false);
		new WifiNetworkSuggestion(configuration, null, true, false, true, true);

		WifiConfiguration configuration1 = new WifiConfiguration();
		configuration1.SSID = TEST_SSID;
		configuration1.BSSID = TEST_BSSID;
		configuration1.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
		WifiNetworkSuggestion suggestion1 =
		new WifiNetworkSuggestion(configuration1, null, false, true, true, true, false);
		new WifiNetworkSuggestion(configuration1, null, false, true, true, true);

		assertEquals(suggestion, suggestion1);
		assertEquals(suggestion.hashCode(), suggestion1.hashCode());
		@@ -626,13 +626,13 @@ public class WifiNetworkSuggestionTest {
		configuration.SSID = TEST_SSID;
		configuration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
		WifiNetworkSuggestion suggestion =
		new WifiNetworkSuggestion(configuration, null, false, false, true, true, false);
		new WifiNetworkSuggestion(configuration, null, false, false, true, true);

		WifiConfiguration configuration1 = new WifiConfiguration();
		configuration1.SSID = TEST_SSID_1;
		configuration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
		WifiNetworkSuggestion suggestion1 =
		new WifiNetworkSuggestion(configuration1, null, false, false, true, true, false);
		new WifiNetworkSuggestion(configuration1, null, false, false, true, true);

		assertNotEquals(suggestion, suggestion1);
		}
		@@ -648,13 +648,13 @@ public class WifiNetworkSuggestionTest {
		configuration.BSSID = TEST_BSSID;
		configuration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
		WifiNetworkSuggestion suggestion =
		new WifiNetworkSuggestion(configuration, null, false, false, true, true, false);
		new WifiNetworkSuggestion(configuration, null, false, false, true, true);

		WifiConfiguration configuration1 = new WifiConfiguration();
		configuration1.SSID = TEST_SSID;
		configuration1.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
		WifiNetworkSuggestion suggestion1 =
		new WifiNetworkSuggestion(configuration1, null, false, false, true, true, false);
		new WifiNetworkSuggestion(configuration1, null, false, false, true, true);

		assertNotEquals(suggestion, suggestion1);
		}
		@@ -669,13 +669,13 @@ public class WifiNetworkSuggestionTest {
		configuration.SSID = TEST_SSID;
		configuration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
		WifiNetworkSuggestion suggestion =
		new WifiNetworkSuggestion(configuration, null, false, false, true, true, false);
		new WifiNetworkSuggestion(configuration, null, false, false, true, true);

		WifiConfiguration configuration1 = new WifiConfiguration();
		configuration1.SSID = TEST_SSID;
		configuration1.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
		WifiNetworkSuggestion suggestion1 =
		new WifiNetworkSuggestion(configuration1, null, false, false, true, true, false);
		new WifiNetworkSuggestion(configuration1, null, false, false, true, true);

		assertNotEquals(suggestion, suggestion1);
		}
		@@ -770,7 +770,7 @@ public class WifiNetworkSuggestionTest {
		.setWpa2Passphrase(TEST_PRESHARED_KEY)
		.setUntrusted(true)
		.build();
		assertTrue(suggestion.isNetworkUntrusted);
		assertTrue(suggestion.isUntrusted());
		assertFalse(suggestion.isUserAllowedToManuallyConnect);
		}

		@@ -786,7 +786,7 @@ public class WifiNetworkSuggestionTest {
		.setPasspointConfig(passpointConfiguration)
		.setUntrusted(true)
		.build();
		assertTrue(suggestion.isNetworkUntrusted);
		assertTrue(suggestion.isUntrusted());
		assertFalse(suggestion.isUserAllowedToManuallyConnect);
		}