summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-08-07 18:19:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-07 18:19:59 +0000
commitcbf16572eb8121a40ecba67ae15796b40f7bc346 (patch)
treed5ecc5a4329bf0466d505bbf4a0de6a2602c19c8 /core/java
parent62e72c21f52dcdf2de7e9e189a5d81826e70f3cf (diff)
parent84933321668c79202de39ea491329f7234ce6ee5 (diff)
Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/pm/PackageManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index f6eaed4e5c5b..ea037270f0d1 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2295,7 +2295,9 @@ public abstract class PackageManager {
/**
* Feature for {@link #getSystemAvailableFeatures} and
- * {@link #hasSystemFeature}: The device supports Wi-Fi Passpoint.
+ * {@link #hasSystemFeature}: The device supports Wi-Fi Passpoint and all
+ * Passpoint related APIs in {@link WifiManager} are supported. Refer to
+ * {@link WifiManager#addOrUpdatePasspointConfiguration} for more info.
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";