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

Merge "API Review: Changes to NetworkProviderInfo.Builder ctor" into udc-dev

Browse Source
This commit is contained in:
Andrew Sapperstein
2023-03-03 02:55:06 +00:00
committed by Android (Google) Code Review
parent 1d6c317f66 c4d49db7db
commit 532c066bd0
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -10115,7 +10115,7 @@ package android.net.wifi.sharedconnectivity.app {
}
public static final class NetworkProviderInfo.Builder {
ctor public NetworkProviderInfo.Builder();
ctor public NetworkProviderInfo.Builder(@NonNull String, @NonNull String);
method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo build();
method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setBatteryPercentage(@IntRange(from=0, to=100) int);
method @NonNull public android.net.wifi.sharedconnectivity.app.NetworkProviderInfo.Builder setConnectionStrength(@IntRange(from=0, to=3) int);

24
wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java
View File

@@ -80,9 +80,11 @@ public final class NetworkProviderInfo implements Parcelable {
DEVICE_TYPE_WATCH,
DEVICE_TYPE_AUTO
})
public @interface DeviceType {}
public @interface DeviceType {
}
@DeviceType private final int mDeviceType;
@DeviceType
private final int mDeviceType;
private final String mDeviceName;
private final String mModelName;
private final int mBatteryPercentage;
@@ -98,7 +100,12 @@ public final class NetworkProviderInfo implements Parcelable {
private int mBatteryPercentage;
private int mConnectionStrength;
public Builder() {}
public Builder(@NonNull String deviceName, @NonNull String modelName) {
Objects.requireNonNull(deviceName);
Objects.requireNonNull(modelName);
mDeviceName = deviceName;
mModelName = modelName;
}
/**
* Sets the device type that provides connectivity.
@@ -120,6 +127,7 @@ public final class NetworkProviderInfo implements Parcelable {
*/
@NonNull
public Builder setDeviceName(@NonNull String deviceName) {
Objects.requireNonNull(deviceName);
mDeviceName = deviceName;
return this;
}
@@ -132,6 +140,7 @@ public final class NetworkProviderInfo implements Parcelable {
*/
@NonNull
public Builder setModelName(@NonNull String modelName) {
Objects.requireNonNull(modelName);
mModelName = modelName;
return this;
}
@@ -176,15 +185,9 @@ public final class NetworkProviderInfo implements Parcelable {
int batteryPercentage, int connectionStrength) {
if (deviceType != DEVICE_TYPE_UNKNOWN && deviceType != DEVICE_TYPE_PHONE
&& deviceType != DEVICE_TYPE_TABLET && deviceType != DEVICE_TYPE_LAPTOP
&& deviceType != DEVICE_TYPE_WATCH && deviceType != DEVICE_TYPE_AUTO) {
&& deviceType != DEVICE_TYPE_WATCH && deviceType != DEVICE_TYPE_AUTO) {
throw new IllegalArgumentException("Illegal device type");
}
if (Objects.isNull(deviceName)) {
throw new IllegalArgumentException("DeviceName must be set");
}
if (Objects.isNull(modelName)) {
throw new IllegalArgumentException("ModelName must be set");
}
if (batteryPercentage < 0 || batteryPercentage > 100) {
throw new IllegalArgumentException("BatteryPercentage must be in range 0-100");
}
@@ -269,6 +272,7 @@ public final class NetworkProviderInfo implements Parcelable {
return Objects.hash(mDeviceType, mDeviceName, mModelName, mBatteryPercentage,
mConnectionStrength);
}
@Override
public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeInt(mDeviceType);

6
wifi/tests/src/android/net/wifi/sharedconnectivity/app/HotspotNetworkConnectionStatusTest.java
View File

@@ -41,9 +41,9 @@ import java.util.Arrays;
public class HotspotNetworkConnectionStatusTest {
private static final long DEVICE_ID = 11L;
private static final NetworkProviderInfo NETWORK_PROVIDER_INFO =
new NetworkProviderInfo.Builder().setDeviceType(DEVICE_TYPE_TABLET)
.setDeviceName("TEST_NAME").setModelName("TEST_MODEL")
.setConnectionStrength(2).setBatteryPercentage(50).build();
new NetworkProviderInfo.Builder("TEST_NAME", "TEST_MODEL")
.setDeviceType(DEVICE_TYPE_TABLET).setConnectionStrength(2)
.setBatteryPercentage(50).build();
private static final int NETWORK_TYPE = NETWORK_TYPE_CELLULAR;
private static final String NETWORK_NAME = "TEST_NETWORK";
private static final String HOTSPOT_SSID = "TEST_SSID";

12
wifi/tests/src/android/net/wifi/sharedconnectivity/app/HotspotNetworkTest.java
View File

@@ -42,9 +42,9 @@ import java.util.Arrays;
public class HotspotNetworkTest {
private static final long DEVICE_ID = 11L;
private static final NetworkProviderInfo NETWORK_PROVIDER_INFO =
new NetworkProviderInfo.Builder().setDeviceType(DEVICE_TYPE_TABLET)
.setDeviceName("TEST_NAME").setModelName("TEST_MODEL")
.setConnectionStrength(2).setBatteryPercentage(50).build();
new NetworkProviderInfo.Builder("TEST_NAME", "TEST_MODEL")
.setDeviceType(DEVICE_TYPE_TABLET).setConnectionStrength(2)
.setBatteryPercentage(50).build();
private static final int NETWORK_TYPE = NETWORK_TYPE_CELLULAR;
private static final String NETWORK_NAME = "TEST_NETWORK";
private static final String HOTSPOT_SSID = "TEST_SSID";
@@ -53,9 +53,9 @@ public class HotspotNetworkTest {
private static final long DEVICE_ID_1 = 111L;
private static final NetworkProviderInfo NETWORK_PROVIDER_INFO1 =
new NetworkProviderInfo.Builder().setDeviceType(DEVICE_TYPE_PHONE)
.setDeviceName("TEST_NAME").setModelName("TEST_MODEL")
.setConnectionStrength(2).setBatteryPercentage(50).build();
new NetworkProviderInfo.Builder("TEST_NAME", "TEST_MODEL")
.setDeviceType(DEVICE_TYPE_PHONE).setConnectionStrength(2)
.setBatteryPercentage(50).build();
private static final int NETWORK_TYPE_1 = NETWORK_TYPE_WIFI;
private static final String NETWORK_NAME_1 = "TEST_NETWORK1";
private static final String HOTSPOT_SSID_1 = "TEST_SSID1";

7
wifi/tests/src/android/net/wifi/sharedconnectivity/app/KnownNetworkConnectionStatusTest.java
View File

@@ -42,10 +42,9 @@ public class KnownNetworkConnectionStatusTest {
private static final String SSID = "TEST_SSID";
private static final int[] SECURITY_TYPES = {SECURITY_TYPE_WEP};
private static final NetworkProviderInfo NETWORK_PROVIDER_INFO =
new NetworkProviderInfo.Builder()
.setDeviceType(DEVICE_TYPE_TABLET).setDeviceName("TEST_NAME").setModelName(
"TEST_MODEL")
.setConnectionStrength(2).setBatteryPercentage(50).build();
new NetworkProviderInfo.Builder("TEST_NAME", "TEST_MODEL")
.setDeviceType(DEVICE_TYPE_TABLET).setConnectionStrength(2)
.setBatteryPercentage(50).build();
private static final String SSID_1 = "TEST_SSID1";
private static final String BUNDLE_KEY = "INT-KEY";
private static final int BUNDLE_VALUE = 1;

10
wifi/tests/src/android/net/wifi/sharedconnectivity/app/KnownNetworkTest.java
View File

@@ -44,16 +44,16 @@ public class KnownNetworkTest {
private static final String SSID = "TEST_SSID";
private static final int[] SECURITY_TYPES = {SECURITY_TYPE_WEP};
private static final NetworkProviderInfo NETWORK_PROVIDER_INFO =
new NetworkProviderInfo.Builder().setDeviceType(DEVICE_TYPE_TABLET)
.setDeviceName("TEST_NAME").setModelName("TEST_MODEL").setConnectionStrength(2)
new NetworkProviderInfo.Builder("TEST_NAME", "TEST_MODEL")
.setDeviceType(DEVICE_TYPE_TABLET).setConnectionStrength(2)
.setBatteryPercentage(50).build();
private static final int NETWORK_SOURCE_1 = NETWORK_SOURCE_CLOUD_SELF;
private static final String SSID_1 = "TEST_SSID1";
private static final int[] SECURITY_TYPES_1 = {SECURITY_TYPE_PSK};
private static final NetworkProviderInfo NETWORK_PROVIDER_INFO1 =
new NetworkProviderInfo.Builder().setDeviceType(DEVICE_TYPE_PHONE)
.setDeviceName("TEST_NAME_1").setModelName("TEST_MODEL_1")
.setConnectionStrength(3).setBatteryPercentage(33).build();
new NetworkProviderInfo.Builder("TEST_NAME_1", "TEST_MODEL_1")
.setDeviceType(DEVICE_TYPE_PHONE).setConnectionStrength(3)
.setBatteryPercentage(33).build();
/**
* Verifies parcel serialization/deserialization.

3
wifi/tests/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfoTest.java
View File

@@ -116,8 +116,7 @@ public class NetworkProviderInfoTest {
}
private NetworkProviderInfo.Builder buildNetworkProviderInfoBuilder() {
return new NetworkProviderInfo.Builder().setDeviceType(DEVICE_TYPE)
.setDeviceName(DEVICE_NAME).setModelName(DEVICE_MODEL)
return new NetworkProviderInfo.Builder(DEVICE_NAME, DEVICE_MODEL).setDeviceType(DEVICE_TYPE)
.setBatteryPercentage(BATTERY_PERCENTAGE)
.setConnectionStrength(CONNECTION_STRENGTH);
}

7
wifi/tests/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManagerTest.java
View File

@@ -57,10 +57,9 @@ import java.util.concurrent.Executor;
public class SharedConnectivityManagerTest {
private static final long DEVICE_ID = 11L;
private static final NetworkProviderInfo NETWORK_PROVIDER_INFO =
new NetworkProviderInfo.Builder()
.setDeviceType(DEVICE_TYPE_TABLET).setDeviceName("TEST_NAME").setModelName(
"TEST_MODEL")
.setConnectionStrength(2).setBatteryPercentage(50).build();
new NetworkProviderInfo.Builder("TEST_NAME", "TEST_MODEL")
.setDeviceType(DEVICE_TYPE_TABLET).setConnectionStrength(2)
.setBatteryPercentage(50).build();
private static final int NETWORK_TYPE = NETWORK_TYPE_CELLULAR;
private static final String NETWORK_NAME = "TEST_NETWORK";
private static final String HOTSPOT_SSID = "TEST_SSID";

7
wifi/tests/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityServiceTest.java
View File

@@ -56,10 +56,9 @@ import java.util.List;
@SmallTest
public class SharedConnectivityServiceTest {
private static final NetworkProviderInfo NETWORK_PROVIDER_INFO =
new NetworkProviderInfo.Builder()
.setDeviceType(DEVICE_TYPE_TABLET).setDeviceName("TEST_NAME").setModelName(
"TEST_MODEL")
.setConnectionStrength(2).setBatteryPercentage(50).build();
new NetworkProviderInfo.Builder("TEST_NAME", "TEST_MODEL")
.setDeviceType(DEVICE_TYPE_TABLET).setConnectionStrength(2)
.setBatteryPercentage(50).build();
private static final HotspotNetwork HOTSPOT_NETWORK =
new HotspotNetwork.Builder().setDeviceId(1).setNetworkProviderInfo(
NETWORK_PROVIDER_INFO)