From aa4c511696ce59f348d2730e751e6986e7291086 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Wed, 22 Jan 2020 22:52:53 +0900
Subject: [PATCH] Add NetworkCapabilities#getSSID to SystemApi

setSSID was added to the API, so it makes sense to have getSSID be part
of the API as well.

Test: m
Bug: 139268426
Change-Id: I6fa9c513ce4fb8ce1e3530776ce8fd5b2e77055e
---
 api/system-current.txt                         | 1 +
 core/java/android/net/NetworkCapabilities.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index e2fb99ea2931d..111735a10a520 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4471,6 +4471,7 @@ package android.net {
 
   public final class NetworkCapabilities implements android.os.Parcelable {
     method public boolean deduceRestrictedCapability();
+    method @Nullable public String getSSID();
     method @NonNull public int[] getTransportTypes();
     method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
     method @NonNull public android.net.NetworkCapabilities setSSID(@Nullable String);
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index f43385d1f2e07..8ebd1392240d9 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;
     }