Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reland: PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev

Browse Source 
am: 3df6be7875

Change-Id: Idc8943172f4540b1c7da47c6da24d5d1eed843a4
This commit is contained in:
Peter Qiu
2017-08-11 22:35:10 +00:00
committed by android-build-merger
parent f4f8058c51 3df6be7875
commit de90ca8412
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/PackageManager.java
View File

@@ -47,6 +47,7 @@ import android.content.res.XmlResourceParser;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -2314,7 +2315,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";