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

Commit 86ea249e authored by Roshan Pius's avatar Roshan Pius
Browse files

WifiNetworkSpecifier/Suggestion Builder: Add @NonNull annotations 

Based on feedback from API council.

Bug: 123313291
Bug: 126699563
Bug: 126701114
Test: Compiles
Change-Id: I119649add8ec71b041631357994aa20c253a5568
parent 5a27fecd

api/current.txt

+26 −26
Original line number Original line Diff line number Diff line
@@ -30091,19 +30091,19 @@ package android.net.wifi { 
    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiNetworkSpecifier> CREATOR;

    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiNetworkSpecifier> CREATOR;

  }

  }

















  public static class WifiNetworkSpecifier.Builder {







  public static final class WifiNetworkSpecifier.Builder {











    ctor public WifiNetworkSpecifier.Builder();







    ctor public WifiNetworkSpecifier.Builder();











    method public android.net.NetworkSpecifier build();







    method @NonNull public android.net.NetworkSpecifier build();











    method public android.net.wifi.WifiNetworkSpecifier.Builder setBssid(@NonNull android.net.MacAddress);







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setBssid(@NonNull android.net.MacAddress);











    method public android.net.wifi.WifiNetworkSpecifier.Builder setBssidPattern(@NonNull android.net.MacAddress, @NonNull android.net.MacAddress);







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setBssidPattern(@NonNull android.net.MacAddress, @NonNull android.net.MacAddress);











    method public android.net.wifi.WifiNetworkSpecifier.Builder setIsEnhancedOpen();







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setIsEnhancedOpen();











    method public android.net.wifi.WifiNetworkSpecifier.Builder setIsHiddenSsid();







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setIsHiddenSsid();











    method public android.net.wifi.WifiNetworkSpecifier.Builder setSsid(@NonNull String);







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setSsid(@NonNull String);











    method public android.net.wifi.WifiNetworkSpecifier.Builder setSsidPattern(@NonNull android.os.PatternMatcher);







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setSsidPattern(@NonNull android.os.PatternMatcher);











    method public android.net.wifi.WifiNetworkSpecifier.Builder setWpa2EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setWpa2EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);











    method public android.net.wifi.WifiNetworkSpecifier.Builder setWpa2Passphrase(@NonNull String);







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setWpa2Passphrase(@NonNull String);











    method public android.net.wifi.WifiNetworkSpecifier.Builder setWpa3EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setWpa3EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);











    method public android.net.wifi.WifiNetworkSpecifier.Builder setWpa3Passphrase(@NonNull String);







    method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setWpa3Passphrase(@NonNull String);











  }







  }



























  public final class WifiNetworkSuggestion implements android.os.Parcelable {







  public final class WifiNetworkSuggestion implements android.os.Parcelable {









@@ -30112,21 +30112,21 @@ package android.net.wifi {









    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiNetworkSuggestion> CREATOR;







    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiNetworkSuggestion> CREATOR;











  }







  }



























  public static class WifiNetworkSuggestion.Builder {







  public static final class WifiNetworkSuggestion.Builder {











    ctor public WifiNetworkSuggestion.Builder();







    ctor public WifiNetworkSuggestion.Builder();











    method public android.net.wifi.WifiNetworkSuggestion build();







    method @NonNull public android.net.wifi.WifiNetworkSuggestion build();











    method public android.net.wifi.WifiNetworkSuggestion.Builder setBssid(@NonNull android.net.MacAddress);







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setBssid(@NonNull android.net.MacAddress);











    method public android.net.wifi.WifiNetworkSuggestion.Builder setIsAppInteractionRequired();







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsAppInteractionRequired();











    method public android.net.wifi.WifiNetworkSuggestion.Builder setIsEnhancedOpen();







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsEnhancedOpen();











    method public android.net.wifi.WifiNetworkSuggestion.Builder setIsHiddenSsid();







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsHiddenSsid();











    method public android.net.wifi.WifiNetworkSuggestion.Builder setIsMetered();







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsMetered();











    method public android.net.wifi.WifiNetworkSuggestion.Builder setIsUserInteractionRequired();







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsUserInteractionRequired();











    method public android.net.wifi.WifiNetworkSuggestion.Builder setPriority(int);







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPriority(int);











    method public android.net.wifi.WifiNetworkSuggestion.Builder setSsid(@NonNull String);







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setSsid(@NonNull String);











    method public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);











    method public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2Passphrase(@NonNull String);







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2Passphrase(@NonNull String);











    method public android.net.wifi.WifiNetworkSuggestion.Builder setWpa3EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa3EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);











    method public android.net.wifi.WifiNetworkSuggestion.Builder setWpa3Passphrase(@NonNull String);







    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa3Passphrase(@NonNull String);











  }







  }



























  public class WpsInfo implements android.os.Parcelable {







  public class WpsInfo implements android.os.Parcelable {

























wifi/java/android/net/wifi/WifiNetworkSpecifier.java



+13
−14




























Original line number
Original line
Diff line number
Diff line








@@ -45,7 +45,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









    /**







    /**











     * Builder used to create {@link WifiNetworkSpecifier} objects.







     * Builder used to create {@link WifiNetworkSpecifier} objects.











     */







     */











    public static class Builder {







    public static final class Builder {











        private static final String MATCH_ALL_SSID_PATTERN_PATH = ".*";







        private static final String MATCH_ALL_SSID_PATTERN_PATH = ".*";











        private static final String MATCH_EMPTY_SSID_PATTERN_PATH = "";







        private static final String MATCH_EMPTY_SSID_PATTERN_PATH = "";











        private static final Pair<MacAddress, MacAddress> MATCH_NO_BSSID_PATTERN1 =







        private static final Pair<MacAddress, MacAddress> MATCH_NO_BSSID_PATTERN1 =










@@ -115,7 +115,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         *                    string pattern to use for matching the network's SSID.







         *                    string pattern to use for matching the network's SSID.











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setSsidPattern(@NonNull PatternMatcher ssidPattern) {







        public @NonNull Builder setSsidPattern(@NonNull PatternMatcher ssidPattern) {











            checkNotNull(ssidPattern);







            checkNotNull(ssidPattern);











            mSsidPatternMatcher = ssidPattern;







            mSsidPatternMatcher = ssidPattern;











            return this;







            return this;









@@ -133,7 +133,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         * @throws IllegalArgumentException if the SSID is not valid unicode.







         * @throws IllegalArgumentException if the SSID is not valid unicode.











         */







         */











        public Builder setSsid(@NonNull String ssid) {







        public @NonNull Builder setSsid(@NonNull String ssid) {











            checkNotNull(ssid);







            checkNotNull(ssid);











            final CharsetEncoder unicodeEncoder = StandardCharsets.UTF_8.newEncoder();







            final CharsetEncoder unicodeEncoder = StandardCharsets.UTF_8.newEncoder();











            if (!unicodeEncoder.canEncode(ssid)) {







            if (!unicodeEncoder.canEncode(ssid)) {









@@ -155,7 +155,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         * @param mask Mask for BSSID pattern.







         * @param mask Mask for BSSID pattern.











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setBssidPattern(







        public @NonNull Builder setBssidPattern(











                @NonNull MacAddress baseAddress, @NonNull MacAddress mask) {







                @NonNull MacAddress baseAddress, @NonNull MacAddress mask) {











            checkNotNull(baseAddress, mask);







            checkNotNull(baseAddress, mask);











            mBssidPatternMatcher = Pair.create(baseAddress, mask);







            mBssidPatternMatcher = Pair.create(baseAddress, mask);









@@ -174,7 +174,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         * @param bssid BSSID of the network.







         * @param bssid BSSID of the network.











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setBssid(@NonNull MacAddress bssid) {







        public @NonNull Builder setBssid(@NonNull MacAddress bssid) {











            checkNotNull(bssid);







            checkNotNull(bssid);











            mBssidPatternMatcher = Pair.create(bssid, MATCH_EXACT_BSSID_PATTERN_MASK);







            mBssidPatternMatcher = Pair.create(bssid, MATCH_EXACT_BSSID_PATTERN_MASK);











            return this;







            return this;









@@ -185,7 +185,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         *







         *











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setIsEnhancedOpen() {







        public @NonNull Builder setIsEnhancedOpen() {











            mIsEnhancedOpen = true;







            mIsEnhancedOpen = true;











            return this;







            return this;











        }







        }









@@ -198,7 +198,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         * @throws IllegalArgumentException if the passphrase is not ASCII encodable.







         * @throws IllegalArgumentException if the passphrase is not ASCII encodable.











         */







         */











        public Builder setWpa2Passphrase(@NonNull String passphrase) {







        public @NonNull Builder setWpa2Passphrase(@NonNull String passphrase) {











            checkNotNull(passphrase);







            checkNotNull(passphrase);











            final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();







            final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();











            if (!asciiEncoder.canEncode(passphrase)) {







            if (!asciiEncoder.canEncode(passphrase)) {









@@ -216,7 +216,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         * @throws IllegalArgumentException if the passphrase is not ASCII encodable.







         * @throws IllegalArgumentException if the passphrase is not ASCII encodable.











         */







         */











        public Builder setWpa3Passphrase(@NonNull String passphrase) {







        public @NonNull Builder setWpa3Passphrase(@NonNull String passphrase) {











            checkNotNull(passphrase);







            checkNotNull(passphrase);











            final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();







            final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();











            if (!asciiEncoder.canEncode(passphrase)) {







            if (!asciiEncoder.canEncode(passphrase)) {









@@ -233,7 +233,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         * @param enterpriseConfig Instance of {@link WifiEnterpriseConfig}.







         * @param enterpriseConfig Instance of {@link WifiEnterpriseConfig}.











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setWpa2EnterpriseConfig(







        public @NonNull Builder setWpa2EnterpriseConfig(











                @NonNull WifiEnterpriseConfig enterpriseConfig) {







                @NonNull WifiEnterpriseConfig enterpriseConfig) {











            checkNotNull(enterpriseConfig);







            checkNotNull(enterpriseConfig);











            mWpa2EnterpriseConfig = new WifiEnterpriseConfig(enterpriseConfig);







            mWpa2EnterpriseConfig = new WifiEnterpriseConfig(enterpriseConfig);









@@ -247,7 +247,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         * @param enterpriseConfig Instance of {@link WifiEnterpriseConfig}.







         * @param enterpriseConfig Instance of {@link WifiEnterpriseConfig}.











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setWpa3EnterpriseConfig(







        public @NonNull Builder setWpa3EnterpriseConfig(











                @NonNull WifiEnterpriseConfig enterpriseConfig) {







                @NonNull WifiEnterpriseConfig enterpriseConfig) {











            checkNotNull(enterpriseConfig);







            checkNotNull(enterpriseConfig);











            mWpa3EnterpriseConfig = new WifiEnterpriseConfig(enterpriseConfig);







            mWpa3EnterpriseConfig = new WifiEnterpriseConfig(enterpriseConfig);









@@ -263,12 +263,11 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         *







         *











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setIsHiddenSsid() {







        public @NonNull Builder setIsHiddenSsid() {











            mIsHiddenSSID = true;







            mIsHiddenSSID = true;











            return this;







            return this;











        }







        }














































        private void setSecurityParamsInWifiConfiguration(







        private void setSecurityParamsInWifiConfiguration(











                @NonNull WifiConfiguration configuration) {







                @NonNull WifiConfiguration configuration) {











            if (!TextUtils.isEmpty(mWpa2PskPassphrase)) { // WPA-PSK network.







            if (!TextUtils.isEmpty(mWpa2PskPassphrase)) { // WPA-PSK network.










@@ -409,7 +408,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









         * @return Instance of {@link NetworkSpecifier}.







         * @return Instance of {@link NetworkSpecifier}.











         * @throws IllegalStateException on invalid params set.







         * @throws IllegalStateException on invalid params set.











         */







         */











        public NetworkSpecifier build() {







        public @NonNull NetworkSpecifier build() {











            if (!hasSetAnyPattern()) {







            if (!hasSetAnyPattern()) {











                throw new IllegalStateException("one of setSsidPattern/setSsid/setBssidPattern/"







                throw new IllegalStateException("one of setSsidPattern/setSsid/setBssidPattern/"











                        + "setBssid should be invoked for specifier");







                        + "setBssid should be invoked for specifier");










@@ -496,7 +495,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc









        this.requestorPackageName = requestorPackageName;







        this.requestorPackageName = requestorPackageName;











    }







    }































    public static final @android.annotation.NonNull Creator<WifiNetworkSpecifier> CREATOR =







    public static final @NonNull Creator<WifiNetworkSpecifier> CREATOR =











            new Creator<WifiNetworkSpecifier>() {







            new Creator<WifiNetworkSpecifier>() {











                @Override







                @Override











                public WifiNetworkSpecifier createFromParcel(Parcel in) {







                public WifiNetworkSpecifier createFromParcel(Parcel in) {

































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



+15
−15




























Original line number
Original line
Diff line number
Diff line








@@ -45,7 +45,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









    /**







    /**











     * Builder used to create {@link WifiNetworkSuggestion} objects.







     * Builder used to create {@link WifiNetworkSuggestion} objects.











     */







     */











    public static class Builder {







    public static final class Builder {











        private static final int UNASSIGNED_PRIORITY = -1;







        private static final int UNASSIGNED_PRIORITY = -1;































        /**







        /**










@@ -125,7 +125,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         * @throws IllegalArgumentException if the SSID is not valid unicode.







         * @throws IllegalArgumentException if the SSID is not valid unicode.











         */







         */











        public Builder setSsid(@NonNull String ssid) {







        public @NonNull Builder setSsid(@NonNull String ssid) {











            checkNotNull(ssid);







            checkNotNull(ssid);











            final CharsetEncoder unicodeEncoder = StandardCharsets.UTF_8.newEncoder();







            final CharsetEncoder unicodeEncoder = StandardCharsets.UTF_8.newEncoder();











            if (!unicodeEncoder.canEncode(ssid)) {







            if (!unicodeEncoder.canEncode(ssid)) {









@@ -150,7 +150,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         * @param bssid BSSID of the network.







         * @param bssid BSSID of the network.











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setBssid(@NonNull MacAddress bssid) {







        public @NonNull Builder setBssid(@NonNull MacAddress bssid) {











            checkNotNull(bssid);







            checkNotNull(bssid);











            mBssid = MacAddress.fromBytes(bssid.toByteArray());







            mBssid = MacAddress.fromBytes(bssid.toByteArray());











            return this;







            return this;









@@ -161,7 +161,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         *







         *











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setIsEnhancedOpen() {







        public @NonNull Builder setIsEnhancedOpen() {











            mIsEnhancedOpen = true;







            mIsEnhancedOpen = true;











            return this;







            return this;











        }







        }









@@ -174,7 +174,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         * @throws IllegalArgumentException if the passphrase is not ASCII encodable.







         * @throws IllegalArgumentException if the passphrase is not ASCII encodable.











         */







         */











        public Builder setWpa2Passphrase(@NonNull String passphrase) {







        public @NonNull Builder setWpa2Passphrase(@NonNull String passphrase) {











            checkNotNull(passphrase);







            checkNotNull(passphrase);











            final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();







            final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();











            if (!asciiEncoder.canEncode(passphrase)) {







            if (!asciiEncoder.canEncode(passphrase)) {









@@ -192,7 +192,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         * @throws IllegalArgumentException if the passphrase is not ASCII encodable.







         * @throws IllegalArgumentException if the passphrase is not ASCII encodable.











         */







         */











        public Builder setWpa3Passphrase(@NonNull String passphrase) {







        public @NonNull Builder setWpa3Passphrase(@NonNull String passphrase) {











            checkNotNull(passphrase);







            checkNotNull(passphrase);











            final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();







            final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();











            if (!asciiEncoder.canEncode(passphrase)) {







            if (!asciiEncoder.canEncode(passphrase)) {









@@ -209,7 +209,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         * @param enterpriseConfig Instance of {@link WifiEnterpriseConfig}.







         * @param enterpriseConfig Instance of {@link WifiEnterpriseConfig}.











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setWpa2EnterpriseConfig(







        public @NonNull Builder setWpa2EnterpriseConfig(











                @NonNull WifiEnterpriseConfig enterpriseConfig) {







                @NonNull WifiEnterpriseConfig enterpriseConfig) {











            checkNotNull(enterpriseConfig);







            checkNotNull(enterpriseConfig);











            mWpa2EnterpriseConfig = new WifiEnterpriseConfig(enterpriseConfig);







            mWpa2EnterpriseConfig = new WifiEnterpriseConfig(enterpriseConfig);









@@ -223,7 +223,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         * @param enterpriseConfig Instance of {@link WifiEnterpriseConfig}.







         * @param enterpriseConfig Instance of {@link WifiEnterpriseConfig}.











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setWpa3EnterpriseConfig(







        public @NonNull Builder setWpa3EnterpriseConfig(











                @NonNull WifiEnterpriseConfig enterpriseConfig) {







                @NonNull WifiEnterpriseConfig enterpriseConfig) {











            checkNotNull(enterpriseConfig);







            checkNotNull(enterpriseConfig);











            mWpa3EnterpriseConfig = new WifiEnterpriseConfig(enterpriseConfig);







            mWpa3EnterpriseConfig = new WifiEnterpriseConfig(enterpriseConfig);









@@ -237,7 +237,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         *







         *











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setIsHiddenSsid() {







        public @NonNull Builder setIsHiddenSsid() {











            mIsHiddenSSID = true;







            mIsHiddenSSID = true;











            return this;







            return this;











        }







        }









@@ -255,7 +255,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         *







         *











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setIsAppInteractionRequired() {







        public @NonNull Builder setIsAppInteractionRequired() {











            mIsAppInteractionRequired = true;







            mIsAppInteractionRequired = true;











            return this;







            return this;











        }







        }









@@ -267,7 +267,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         *







         *











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setIsUserInteractionRequired() {







        public @NonNull Builder setIsUserInteractionRequired() {











            mIsUserInteractionRequired = true;







            mIsUserInteractionRequired = true;











            return this;







            return this;











        }







        }









@@ -283,7 +283,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         * @throws IllegalArgumentException if the priority value is negative.







         * @throws IllegalArgumentException if the priority value is negative.











         */







         */











        public Builder setPriority(int priority) {







        public @NonNull Builder setPriority(int priority) {











            if (priority < 0) {







            if (priority < 0) {











                throw new IllegalArgumentException("Invalid priority value " + priority);







                throw new IllegalArgumentException("Invalid priority value " + priority);











            }







            }









@@ -298,7 +298,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         *







         *











         * @return Instance of {@link Builder} to enable chaining of the builder method.







         * @return Instance of {@link Builder} to enable chaining of the builder method.











         */







         */











        public Builder setIsMetered() {







        public @NonNull Builder setIsMetered() {











            mIsMetered = true;







            mIsMetered = true;











            return this;







            return this;











        }







        }










@@ -406,7 +406,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









         * @return Instance of {@link WifiNetworkSuggestion}.







         * @return Instance of {@link WifiNetworkSuggestion}.











         * @throws IllegalStateException on invalid params set.







         * @throws IllegalStateException on invalid params set.











         */







         */











        public WifiNetworkSuggestion build() {







        public @NonNull WifiNetworkSuggestion build() {











            if (mSsid == null) {







            if (mSsid == null) {











                throw new IllegalStateException("setSsid should be invoked for suggestion");







                throw new IllegalStateException("setSsid should be invoked for suggestion");











            }







            }










@@ -483,7 +483,7 @@ public final class WifiNetworkSuggestion implements Parcelable {









        this.suggestorPackageName = suggestorPackageName;







        this.suggestorPackageName = suggestorPackageName;











    }







    }































    public static final @android.annotation.NonNull Creator<WifiNetworkSuggestion> CREATOR =







    public static final @NonNull Creator<WifiNetworkSuggestion> CREATOR =











            new Creator<WifiNetworkSuggestion>() {







            new Creator<WifiNetworkSuggestion>() {











                @Override







                @Override











                public WifiNetworkSuggestion createFromParcel(Parcel in) {







                public WifiNetworkSuggestion createFromParcel(Parcel in) {