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

Commit 9a4b4405 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Unhide system feature flag FEATURE_WIFI_PASSPOINT"

parents 041a1fe3 76f1aa9e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10754,6 +10754,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi";

    field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";

    field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";

    field public static final java.lang.String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";

    field public static final int GET_ACTIVITIES = 1; // 0x1

    field public static final int GET_CONFIGURATIONS = 16384; // 0x4000

    field public static final deprecated int GET_DISABLED_COMPONENTS = 512; // 0x200

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11458,6 +11458,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi";

    field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";

    field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";

    field public static final java.lang.String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";

    field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20

    field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4

    field public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 64; // 0x40

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10795,6 +10795,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi";

    field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";

    field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";

    field public static final java.lang.String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";

    field public static final int GET_ACTIVITIES = 1; // 0x1

    field public static final int GET_CONFIGURATIONS = 16384; // 0x4000

    field public static final deprecated int GET_DISABLED_COMPONENTS = 512; // 0x200

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

+0 −1
Original line number Diff line number Diff line
@@ -2285,7 +2285,6 @@ public abstract class PackageManager { 
    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports Wi-Fi Passpoint.

     * @hide

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";