diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-01-22 07:30:49 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-22 07:30:49 -0800 |
| commit | 3a8c533d6545ee467dfb38f57f05676557e3121c (patch) | |
| tree | 4ed8b4dd8bdb719fad737f837ddbc155b64ff270 /core/java | |
| parent | 876c59823ea55df24ae533d7a9129f95f77a98a6 (diff) | |
| parent | 385afc999e81bbf75a95b8302c25d39e6cb4df6e (diff) | |
Merge "Add NetworkCapabilities#getSSID to SystemApi"
am: 385afc999e
Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index f43385d1f2e0..8ebd1392240d 100644 --- 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; } |