summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2025-03-30 15:24:28 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2025-03-30 15:24:28 -0700
commite4f6a75c6168df72d00b327dc28468255eb98808 (patch)
tree27efc1e129fdc979902dc4921ff712e3a6dcd419
parent8693e544214d5b7008b3712b3ce4189c681ec0ba (diff)
parent97e1b700395621437977c06ef2f956ef0940db40 (diff)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32747462', 'googleplex-android-review.googlesource.com/32792755'] into 25Q2-release.
Change-Id: Id5ae81a6c69d218b4c1588dd9c52a8c970da5228
-rw-r--r--aconfig/bp2a/com.android.server.telecom.flags/update_preferred_audio_device_logic_flag_values.textproto6
-rw-r--r--aconfig/bp2a/com.android.window.flags/clear_system_vibrator_flag_values.textproto6
2 files changed, 12 insertions, 0 deletions
diff --git a/aconfig/bp2a/com.android.server.telecom.flags/update_preferred_audio_device_logic_flag_values.textproto b/aconfig/bp2a/com.android.server.telecom.flags/update_preferred_audio_device_logic_flag_values.textproto
new file mode 100644
index 00000000..80b1133a
--- /dev/null
+++ b/aconfig/bp2a/com.android.server.telecom.flags/update_preferred_audio_device_logic_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.server.telecom.flags"
+ name: "update_preferred_audio_device_logic"
+ state: ENABLED
+ permission: READ_WRITE
+}
diff --git a/aconfig/bp2a/com.android.window.flags/clear_system_vibrator_flag_values.textproto b/aconfig/bp2a/com.android.window.flags/clear_system_vibrator_flag_values.textproto
new file mode 100644
index 00000000..5107db04
--- /dev/null
+++ b/aconfig/bp2a/com.android.window.flags/clear_system_vibrator_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.window.flags"
+ name: "clear_system_vibrator"
+ state: ENABLED
+ permission: READ_ONLY
+}