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

Commit be3011ed authored by Ahmad Khalil's avatar Ahmad Khalil Committed by Android (Google) Code Review
Browse files

Merge "Add flag to enable Haptics Customization feature" into main

parents 6c497788 28f7ced1
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ java_defaults {
        ":android.os.flags-aconfig-java{.generated_srcjars}",
        ":android.os.vibrator.flags-aconfig-java{.generated_srcjars}",
        ":android.security.flags-aconfig-java{.generated_srcjars}",
        ":android.media.flags-aconfig-java{.generated_srcjars}",
        ":camera_platform_flags_core_java_lib{.generated_srcjars}",
        ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",
        ":com.android.text.flags-aconfig-java{.generated_srcjars}",
@@ -157,3 +158,16 @@ java_aconfig_library {
    aconfig_declarations: "android.os.vibrator.flags-aconfig",
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}

// Media
aconfig_declarations {
    name: "android.media.flags-aconfig",
    package: "android.media",
    srcs: ["media/java/android/media/*.aconfig"],
}

java_aconfig_library {
    name: "android.media.flags-aconfig-java",
    aconfig_declarations: "android.media.flags-aconfig",
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+8 −0
Original line number Diff line number Diff line
package: "android.media"

flag {
    name: "haptics_customization_enabled"
    namespace: "media"
    description: "Enables the haptics customization feature"
    bug: "241918098"
}