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

Commit 413c17ce authored by Han Li's avatar Han Li Committed by Android (Google) Code Review
Browse files

Merge changes I64fd00a8,Icd495203 into main 

* changes:
  Add android.hardware.type.glasses for Glasses Feature
  Add AConfig flag for Glasses Feature
parents 1e08a64a 33d7aaab

AconfigFlags.bp

+19 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ aconfig_declarations_group { 
        "android.webkit.flags-aconfig-java",

        "android.widget.flags-aconfig-java",

        "android.xr.flags-aconfig-java-export",

        "com.android.microxr.flags.flags-aconfig-java",

        "art_exported_aconfig_flags_lib",

        "backstage_power_flags_lib",

        "backup_flags_lib",
@@ -1092,6 +1093,24 @@ java_aconfig_library { 
    ],

}



// XR - Glasses

aconfig_declarations {

    name: "com.android.microxr.flags.flags-aconfig",

    container: "system",

    package: "com.android.microxr.flags",

    srcs: ["core/java/android/content/pm/glasses.aconfig"],

}



java_aconfig_library {

    name: "com.android.microxr.flags.flags-aconfig-java",

    aconfig_declarations: "com.android.microxr.flags.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

    ],

}



// android.app

aconfig_declarations {

    name: "android.app.flags-aconfig",

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13784,6 +13784,7 @@ package android.content.pm { 
    field public static final String FEATURE_FINGERPRINT = "android.hardware.fingerprint";

    field public static final String FEATURE_FREEFORM_WINDOW_MANAGEMENT = "android.software.freeform_window_management";

    field public static final String FEATURE_GAMEPAD = "android.hardware.gamepad";

    field @FlaggedApi("com.android.microxr.flags.xr_glasses_feature") public static final String FEATURE_GLASSES = "android.hardware.type.glasses";

    field public static final String FEATURE_HARDWARE_KEYSTORE = "android.hardware.hardware_keystore";

    field public static final String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";

    field public static final String FEATURE_HOME_SCREEN = "android.software.home_screen";

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

+12 −0
Original line number Diff line number Diff line
@@ -4467,6 +4467,18 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_PC = "android.hardware.type.pc";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: This is a full stack Android device with or without a display

     * on glasses. Glasses here are defined to be the device worn on the body, perhaps on

     * the head. The user is very close and usually wears the device when interacting with the

     * device. The device likely requires a companion phone to access features of apps. User input

     * can be a variety of touchpad on the glasses, audio and the companion phone.

     */

    @FlaggedApi(com.android.microxr.flags.Flags.FLAG_XR_GLASSES_FEATURE)

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_GLASSES = "android.hardware.type.glasses";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:

     * The device supports printing.

core/java/android/content/pm/glasses.aconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
package: "com.android.microxr.flags"

container: "system"



flag {

    namespace: "xr"

    name: "xr_glasses_feature"

    description: "Adds features used by Android XR Glasses"

    bug: "430302860"

}
 
 No newline at end of file