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

Commit 6f883edd authored by Nate Jiang's avatar Nate Jiang Committed by Android (Google) Code Review
Browse files

Merge "[NetworkSuggestion] Allow app to set subId for the suggestion"

parents 5ba61fa3 c25eba37

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -31773,6 +31773,7 @@ package android.net.wifi { 
    method @IntRange(from=0) public int getPriority();

    method public int getPriorityGroup();

    method @Nullable public String getSsid();

    method public int getSubscriptionId();

    method public boolean isAppInteractionRequired();

    method public boolean isCredentialSharedWithUser();

    method public boolean isEnhancedOpen();
@@ -31801,6 +31802,7 @@ package android.net.wifi { 
    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPriority(@IntRange(from=0) int);

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

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

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

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

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

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7325,6 +7325,7 @@ package android.net.wifi { 
    field @Deprecated public int numScorerOverrideAndSwitchedNetwork;

    field @Deprecated public boolean requirePmf;

    field @Deprecated public boolean shared;

    field @Deprecated public int subscriptionId;

    field @Deprecated public boolean useExternalScores;

  }

































api/system-lint-baseline.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -229,6 +229,8 @@ MutableBareField: android.net.wifi.WifiConfiguration#saePasswordId:













    















MutableBareField: android.net.wifi.WifiConfiguration#shared:















    













MutableBareField: android.net.wifi.WifiConfiguration#subscriptionId:













    Bare field subscriptionId must be marked final, or moved behind accessors if mutable















MutableBareField: android.net.wifi.WifiScanner.ScanSettings#type:















    

















































wifi/api/current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -492,6 +492,7 @@ package android.net.wifi {













    method @IntRange(from=0) public int getPriority();















    method public int getPriorityGroup();















    method @Nullable public String getSsid();













    method public int getSubscriptionId();















    method public boolean isAppInteractionRequired();















    method public boolean isCredentialSharedWithUser();















    method public boolean isEnhancedOpen();










@@ -520,6 +521,7 @@ package android.net.wifi {













    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPriority(@IntRange(from=0) int);















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















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













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















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















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















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

































wifi/api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -350,6 +350,7 @@ package android.net.wifi {













    field @Deprecated public int numScorerOverrideAndSwitchedNetwork;















    field @Deprecated public boolean requirePmf;















    field @Deprecated public boolean shared;













    field @Deprecated public int subscriptionId;















    field @Deprecated public boolean useExternalScores;















  }