commit | ece6c2d06cc15c6cf1a7aaab2827062b7b1bfc60 | [log] [tgz] |
---|---|---|
author | Remi NGUYEN VAN <reminv@google.com> | Wed Jan 22 07:30:49 2020 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jan 22 07:30:49 2020 -0800 |
tree | eccbfe35d1c5deaa0c26be504dbfa8148ca242e2 | |
parent | 4c14caf35541b66efc2d7eca1e8e7d2643a86542 [diff] | |
parent | 026e45f305a624f147143590bd38cf7f660ab063 [diff] |
Merge "Add NetworkCapabilities#getSSID to SystemApi" am: 026e45f305 Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index f43385d..8ebd139 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java
@@ -1283,6 +1283,7 @@ * Gets the SSID of this network, or null if none or unknown. * @hide */ + @SystemApi public @Nullable String getSSID() { return mSSID; }