summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nate(Qiang) Jiang <qiangjiang@google.com> 2020-01-14 15:54:14 -0800
committer Nate(Qiang) Jiang <qiangjiang@google.com> 2020-01-15 10:07:18 -0800
commit31de34693ed8444ded6adf0350242229b279f70a (patch)
tree1f12fc797e61052a8731b11489056b669751d374
parent3f629cdf3c083a29382539a82fe8a58d4a4433b7 (diff)
Change Doc for getConnectionInfo
When app doesn't have location permission or location mode disabled, FQDN and friendly name will not ba able to access. Bug: 147699220 Test: build Change-Id: If4000ba550ee58a17cbf77e4e28a9e6a592b6264
-rw-r--r--wifi/java/android/net/wifi/WifiInfo.java11
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java2
2 files changed, 13 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
index 62337cbf7e22..dc8fa65fd747 100644
--- a/wifi/java/android/net/wifi/WifiInfo.java
+++ b/wifi/java/android/net/wifi/WifiInfo.java
@@ -631,6 +631,11 @@ public class WifiInfo implements Parcelable {
/**
* Returns the Fully Qualified Domain Name of the network if it is a Passpoint network.
+ * <p>
+ * The FQDN may be
+ * <lt>{@code null} if no network currently connected, currently connected network is not
+ * passpoint network or the caller has insufficient permissions to access the FQDN.</lt>
+ * </p>
*/
public @Nullable String getPasspointFqdn() {
return mFqdn;
@@ -643,6 +648,12 @@ public class WifiInfo implements Parcelable {
/**
* Returns the Provider Friendly Name of the network if it is a Passpoint network.
+ * <p>
+ * The Provider Friendly Name may be
+ * <lt>{@code null} if no network currently connected, currently connected network is not
+ * passpoint network or the caller has insufficient permissions to access the Provider Friendly
+ * Name. </lt>
+ * </p>
*/
public @Nullable String getPasspointProviderFriendlyName() {
return mProviderFriendlyName;
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 729ac14b8b73..c428f0cab3df 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -2602,6 +2602,8 @@ public class WifiManager {
* the same permissions as {@link #getScanResults}. If such access is not allowed,
* {@link WifiInfo#getSSID} will return {@link #UNKNOWN_SSID} and
* {@link WifiInfo#getBSSID} will return {@code "02:00:00:00:00:00"}.
+ * {@link WifiInfo#getPasspointFqdn()} will return null.
+ * {@link WifiInfo#getPasspointProviderFriendlyName()} will return null.
*
* @return the Wi-Fi information, contained in {@link WifiInfo}.
*/