| commit | b4da9b933d88ebb57aaf3cf89f59c3f1b14f445c | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 22 15:47:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 22 15:47:20 2020 +0000 |
| tree | eccbfe35d1c5deaa0c26be504dbfa8148ca242e2 | |
| parent | 0a0eaa7e82e3a2bcda7f71505584a26896b762af [diff] | |
| parent | ece6c2d06cc15c6cf1a7aaab2827062b7b1bfc60 [diff] |
Merge "Add NetworkCapabilities#getSSID to SystemApi" am: 026e45f305 am: ece6c2d06c Change-Id: I5d98ddd28ac963615b0a00441b8716f32602fbe8
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; }