diff options
| author | 2024-09-11 22:52:40 +0000 | |
|---|---|---|
| committer | 2024-09-11 22:52:40 +0000 | |
| commit | 38e65b76cafa66dfe8e6b4c68a5cdd92384d87d0 (patch) | |
| tree | 90b2e0c308d3256451c24c637f3468fbfdd51a9b | |
| parent | 0a9da6f301153be218000eb518381116aa13eac6 (diff) | |
| parent | 5abea933e4f67ca75cce085cdd7e6f3af3a16830 (diff) | |
Merge "Create cc library for vibrator flags" into main am: 5abea933e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3253202
Change-Id: I8935ffea64fdd64244158f924bf34e519e342ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | AconfigFlags.bp | 7 | ||||
| -rw-r--r-- | core/java/android/os/vibrator/flags.aconfig | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 96d6f32fc1df..d4af94035fd1 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -459,6 +459,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 eda755c05509..7d74bd2374ac 100644 --- a/core/java/android/os/vibrator/flags.aconfig +++ b/core/java/android/os/vibrator/flags.aconfig @@ -31,3 +31,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 + } +} |