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

Commit 3a8c533d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Add NetworkCapabilities#getSSID to SystemApi" 

am: 385afc99

Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236
parents 876c5982 385afc99

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4501,6 +4501,7 @@ package android.net { 














  public final class NetworkCapabilities implements android.os.Parcelable {















    method public boolean deduceRestrictedCapability();













    method @Nullable public String getSSID();















    method @NonNull public int[] getTransportTypes();















    method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);















    method @NonNull public android.net.NetworkCapabilities setSSID(@Nullable String);

































core/java/android/net/NetworkCapabilities.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -1283,6 +1283,7 @@ public final class NetworkCapabilities implements Parcelable {













     * Gets the SSID of this network, or null if none or unknown.















     * @hide















     */













    @SystemApi















    public @Nullable String getSSID() {















        return mSSID;















    }