Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05fea28d authored by Ted Bauer's avatar Ted Bauer
Browse files

feat: show if flag is locally overridden 

Bug: 324436145
Test: adb shell aflags list
Change-Id: Id239a760e86e469f77d1e99f7a6f27d54cb87206
parent d9fc22ae

tools/aconfig/aflags/src/aconfig_storage_source.rs

+3 −1
Original line number Diff line number Diff line
@@ -65,7 +65,9 @@ fn reconcile( 
        } 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

tools/aconfig/aflags/src/main.rs

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ impl std::fmt::Display for FlagPermission { 
enum ValuePickedFrom {

    Default,

    Server,

    Local,

}



impl std::fmt::Display for ValuePickedFrom {
@@ -60,6 +61,7 @@ impl std::fmt::Display for ValuePickedFrom { 
            match &self {

                Self::Default => "default",

                Self::Server => "server",

                Self::Local => "local",

            }

        )

    }