commit ac3ac905e31353d6920679d646f3e8b50d839d1d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 25 16:00:57 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 25 16:00:57 2024 +0000
tree 5c8fbf09637c150449f3c0bc0279a0181ca6ba66
parent 744f663ae5ee615df7dc6e6dc5351f976567b8b5
parent 0b68ccf526e20b8eaf7c383a44b08c8720e1262b

Merge "haptics: remove unused haptics_customization_enabled" into main

core/java/android/os/vibrator/flags.aconfig

diff --git a/core/java/android/os/vibrator/flags.aconfig b/core/java/android/os/vibrator/flags.aconfig
index bb0498e..229d119 100644
--- a/core/java/android/os/vibrator/flags.aconfig
+++ b/core/java/android/os/vibrator/flags.aconfig
@@ -9,14 +9,6 @@
 
 flag {
     namespace: "haptics"
-    name: "haptics_customization_enabled"
-    is_exported: true
-    description: "Enables the haptics customization feature"
-    bug: "241918098"
-}
-
-flag {
-    namespace: "haptics"
     name: "haptic_feedback_vibration_oem_customization_enabled"
     description: "Enables OEMs/devices to customize vibrations for haptic feedback"
     # Make read only. This is because the flag is used only once, and this could happen before