Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10b94633 authored by Peter Qiu's avatar Peter Qiu Committed by android-build-merger
Browse files

Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into... 

Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev am: cbf16572
am: 25a08bb2

Change-Id: I94f6dafb4b2dbcc060fe0dc8904a39bae7f8ba14
parents 8dc5772c 25a08bb2

core/java/android/content/pm/PackageManager.java

+3 −1
Original line number Diff line number Diff line
@@ -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";