summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lais Andrade <lsandrade@google.com> 2024-07-30 15:48:19 +0100
committer Shunkai Yao <yaoshunkai@google.com> 2024-09-03 22:44:52 +0000
commit228acb7e4534b501a0006ee2e5f9e414e4d6b491 (patch)
tree58572b2aa354cf31c804bcb6dbc63b6a02213960
parent73074945184b431e8fa6dad58fc583d15ad178e4 (diff)
Create cc library for vibrator flags
Bug: 356144312 Flag: android.os.vibrator.fix_audio_coupled_haptics_scaling Test: libvibrator_test Change-Id: I8a452fc26391d58bc006c2f887fcc91b3c1f82c3 Merged-In: I8a452fc26391d58bc006c2f887fcc91b3c1f82c3
-rw-r--r--AconfigFlags.bp7
-rw-r--r--core/java/android/os/vibrator/flags.aconfig10
2 files changed, 17 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 5f23edaeb01a..0ae60c9bc65d 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -400,6 +400,13 @@ java_aconfig_library {
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+cc_aconfig_library {
+ name: "android.os.vibrator.flags-aconfig-cc",
+ aconfig_declarations: "android.os.vibrator.flags-aconfig",
+ host_supported: true,
+ vendor_available: true,
+}
+
// View
aconfig_declarations {
name: "android.view.flags-aconfig",
diff --git a/core/java/android/os/vibrator/flags.aconfig b/core/java/android/os/vibrator/flags.aconfig
index 77af31e5b2c7..d3c23ea51182 100644
--- a/core/java/android/os/vibrator/flags.aconfig
+++ b/core/java/android/os/vibrator/flags.aconfig
@@ -38,3 +38,13 @@ flag {
description: "Enables the adaptive haptics feature"
bug: "305961689"
}
+
+flag {
+ namespace: "haptics"
+ name: "fix_audio_coupled_haptics_scaling"
+ description: "Fix the audio-coupled haptics scaling to use same function as VibrationEffect"
+ bug: "356144312"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}