Merge "Add NetworkCapabilities#getSSID to SystemApi"

am: 7c25b78583 Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236
2020-01-22 07:30:49 -08:00 · 2020-01-22 07:30:49 -08:00 · 2cab87c895
commit 2cab87c895
parent 9b75818ff9 7c25b78583
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;
    }