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

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

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

am: 3df6be78

Change-Id: Idc8943172f4540b1c7da47c6da24d5d1eed843a4
parents f4f8058c 3df6be78

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

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