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

Commit 90555617 authored by Han Li's avatar Han Li
Browse files

Rename android.hardware.type.glasses to android.hardware.type.xr_peripheral 

Bug: 441987077
Bug: 442818733
Flag: com.android.microxr.xr_glasses_feature
Test: m update-api
Change-Id: Ibb4dc0f8ea83d0e03f96fd7e08e53e019cb94f4e
parent c8db426a

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -13755,7 +13755,6 @@ 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.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";
@@ -13866,6 +13865,7 @@ package android.content.pm { 
    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String FEATURE_XR_INPUT_CONTROLLER = "android.hardware.xr.input.controller";

    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String FEATURE_XR_INPUT_EYE_TRACKING = "android.hardware.xr.input.eye_tracking";

    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String FEATURE_XR_INPUT_HAND_TRACKING = "android.hardware.xr.input.hand_tracking";

    field @FlaggedApi("com.android.microxr.xr_glasses_feature") public static final String FEATURE_XR_PERIPHERAL = "android.hardware.type.xr_peripheral";

    field public static final int FLAG_PERMISSION_WHITELIST_INSTALLER = 2; // 0x2

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

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

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

+4 −6
Original line number Diff line number Diff line
@@ -4469,15 +4469,13 @@ public abstract class PackageManager { 


    /**

     * 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.

     * {@link #hasSystemFeature}: An XR peripheral is defined as a full stack Android device with

     * or without a display, with or without inputs, and no user-installable apps. XR peripherals

     * are worn on the user's body and likely require a companion device for user interactions.

     */

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

    @SdkConstant(SdkConstantType.FEATURE)

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

    public static final String FEATURE_XR_PERIPHERAL = "android.hardware.type.xr_peripheral";



    /**

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