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

Merge "Add NetworkCapabilities#getSSID to SystemApi"

Browse Source
This commit is contained in:
Treehugger Robot
2020-01-22 15:23:07 +00:00
committed by Gerrit Code Review
parent b9e3e9e34c aa4c511696
commit 385afc999e
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -4501,6 +4501,7 @@ package android.net {
public final class NetworkCapabilities implements android.os.Parcelable { public final class NetworkCapabilities implements android.os.Parcelable {
method public boolean deduceRestrictedCapability(); method public boolean deduceRestrictedCapability();
method @Nullable public String getSSID();
method @NonNull public int[] getTransportTypes(); method @NonNull public int[] getTransportTypes();
method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities); method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
method @NonNull public android.net.NetworkCapabilities setSSID(@Nullable String); method @NonNull public android.net.NetworkCapabilities setSSID(@Nullable String);

1
core/java/android/net/NetworkCapabilities.java
View File

@@ -1283,6 +1283,7 @@ public final class NetworkCapabilities implements Parcelable {
* Gets the SSID of this network, or null if none or unknown. * Gets the SSID of this network, or null if none or unknown.
* @hide * @hide
*/ */
@SystemApi
public @Nullable String getSSID() { public @Nullable String getSSID() {
return mSSID; return mSSID;
} }