feat: show if flag is locally overridden
Bug: 324436145
Test: adb shell aflags list
Change-Id: Id239a760e86e469f77d1e99f7a6f27d54cb87206
diff --git a/tools/aconfig/aflags/src/aconfig_storage_source.rs b/tools/aconfig/aflags/src/aconfig_storage_source.rs
index d9dc15f..0dfb956 100644
--- a/tools/aconfig/aflags/src/aconfig_storage_source.rs
+++ b/tools/aconfig/aflags/src/aconfig_storage_source.rs
@@ -65,7 +65,9 @@
} else {
FlagPermission::ReadOnly
};
- let value_picked_from = if Some(value) == default_value {
+ let value_picked_from = if listed_flag.has_local_override {
+ ValuePickedFrom::Local
+ } else if Some(value) == default_value {
ValuePickedFrom::Default
} else {
ValuePickedFrom::Server
diff --git a/tools/aconfig/aflags/src/main.rs b/tools/aconfig/aflags/src/main.rs
index 6d76fd0..0a5c989 100644
--- a/tools/aconfig/aflags/src/main.rs
+++ b/tools/aconfig/aflags/src/main.rs
@@ -50,6 +50,7 @@
enum ValuePickedFrom {
Default,
Server,
+ Local,
}
impl std::fmt::Display for ValuePickedFrom {
@@ -60,6 +61,7 @@
match &self {
Self::Default => "default",
Self::Server => "server",
+ Self::Local => "local",
}
)
}