Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edba9d3c authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I3953f78aa8cbcef04f9f117d312ff78904a0d46a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf51769e 532c066b

core/api/system-current.txt

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

























wifi/java/src/android/net/wifi/sharedconnectivity/app/NetworkProviderInfo.java



+14
−10




























Original line number
Diff line number
Diff line








@@ -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;















        }










@@ -179,12 +188,6 @@ public final class NetworkProviderInfo implements Parcelable {













                && 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);

































wifi/tests/src/android/net/wifi/sharedconnectivity/app/HotspotNetworkConnectionStatusTest.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -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";

































wifi/tests/src/android/net/wifi/sharedconnectivity/app/HotspotNetworkTest.java



+6
−6




























Original line number
Diff line number
Diff line








@@ -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";

































wifi/tests/src/android/net/wifi/sharedconnectivity/app/KnownNetworkConnectionStatusTest.java



+3
−4




























Original line number
Diff line number
Diff line








@@ -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;