summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mohamad Mahmoud <mohamadmahmoud@google.com> 2024-07-12 15:53:51 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-07-12 15:53:51 +0000
commit0474c8ae82ffa4da9cf0ea9892f47b0cc1c8ff8e (patch)
tree5abe5dd59e5152d404d8dc9c4f1b9e9ca9c377bd
parent350282fd1913af975071ba4912afd110a7f3a9c3 (diff)
parent17c0c2fbedf9573a50476935b9a266f05bdd6a85 (diff)
Merge "Move stability flags to the stability namespace" into main
-rw-r--r--core/java/com/android/internal/os/flags.aconfig2
-rw-r--r--services/core/java/com/android/server/am/flags.aconfig4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/com/android/internal/os/flags.aconfig b/core/java/com/android/internal/os/flags.aconfig
index 30fa4f1a472a..2ad665181e70 100644
--- a/core/java/com/android/internal/os/flags.aconfig
+++ b/core/java/com/android/internal/os/flags.aconfig
@@ -12,7 +12,7 @@ flag {
flag {
name: "use_transaction_codes_for_unknown_methods"
- namespace: "dropbox"
+ namespace: "stability"
description: "Use transaction codes when the method names is unknown"
bug: "350041302"
is_fixed_read_only: true
diff --git a/services/core/java/com/android/server/am/flags.aconfig b/services/core/java/com/android/server/am/flags.aconfig
index d21478807d4d..5315167b46eb 100644
--- a/services/core/java/com/android/server/am/flags.aconfig
+++ b/services/core/java/com/android/server/am/flags.aconfig
@@ -163,7 +163,7 @@ flag {
flag {
name: "collect_logcat_on_run_synchronously"
- namespace: "dropbox"
+ namespace: "stability"
description: "Allow logcat collection on synchronous dropbox collection"
bug: "324222683"
is_fixed_read_only: true
@@ -171,7 +171,7 @@ flag {
flag {
name: "enable_dropbox_watchdog_headers"
- namespace: "dropbox"
+ namespace: "stability"
description: "Add watchdog-specific dropbox headers"
bug: "330682397"
is_fixed_read_only: true