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

Commit 1b25bd8e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Modify the AConfig flag name for Glasses" into main

parents e052158b fe9043e6

AconfigFlags.bp

+5 −5
Original line number Diff line number Diff line
@@ -89,7 +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",

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

        "art_exported_aconfig_flags_lib",

        "backstage_power_flags_lib",

        "backup_flags_lib",
@@ -1110,15 +1110,15 @@ java_aconfig_library { 


// XR - Glasses

aconfig_declarations {

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

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

    container: "system",

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

    package: "com.android.microxr",

    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",

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

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

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

    apex_available: [

        "//apex_available:platform",

core/api/current.txt

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

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

+1 −1
Original line number Diff line number Diff line
@@ -4475,7 +4475,7 @@ public abstract class PackageManager { 
     * 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)

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

    @SdkConstant(SdkConstantType.FEATURE)

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

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

+1 −1
Original line number Diff line number Diff line 
package: "com.android.microxr.flags"

package: "com.android.microxr"

container: "system"



flag {