Merge "Add NetworkCapabilities#getSSID to SystemApi" am: 7c25b78583 am: 2cab87c895

Change-Id: I5d98ddd28ac963615b0a00441b8716f32602fbe8
2020-01-22 15:47:20 +00:00
parent c1c4793bd1 2cab87c895
commit 93a1ccf499
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -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;
    }