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

Commit b34658e2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "aconfig-improve-dump-formats" into main am: 08cb169c 

Original change: https://android-review.googlesource.com/c/platform/build/+/2666957



Change-Id: I161e7f7f00f0df4666e425ceef47643463322b65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c2a6b4c 08cb169c

tools/aconfig/src/commands.rs

+16 −7
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ pub fn create_device_config_sysprops(mut input: Input) -> Result<Vec<u8>> { 
#[derive(Copy, Clone, Debug, PartialEq, Eq, ValueEnum)]

pub enum DumpFormat {

    Text,

    Debug,

    Verbose,

    Protobuf,

    Textproto,

}
@@ -229,18 +229,27 @@ pub fn dump_parsed_flags(mut input: Vec<Input>, format: DumpFormat) -> Result<Ve 
        DumpFormat::Text => {

            for parsed_flag in parsed_flags.parsed_flag.into_iter() {

                let line = format!(

                    "{}/{}: {:?} {:?}\n",

                    "{}/{}: {:?} + {:?}\n",

                    parsed_flag.package(),

                    parsed_flag.name(),

                    parsed_flag.state(),

                    parsed_flag.permission()

                    parsed_flag.permission(),

                    parsed_flag.state()

                );

                output.extend_from_slice(line.as_bytes());

            }

        }

        DumpFormat::Debug => {

        DumpFormat::Verbose => {

            for parsed_flag in parsed_flags.parsed_flag.into_iter() {

                let line = format!("{:#?}\n", parsed_flag);

                let sources: Vec<_> =

                    parsed_flag.trace.iter().map(|tracepoint| tracepoint.source()).collect();

                let line = format!(

                    "{}/{}: {:?} + {:?} ({})\n",

                    parsed_flag.package(),

                    parsed_flag.name(),

                    parsed_flag.permission(),

                    parsed_flag.state(),

                    sources.join(", ")

                );

                output.extend_from_slice(line.as_bytes());

            }

        }
@@ -326,7 +335,7 @@ mod tests { 
        let input = parse_test_flags_as_input();

        let bytes = dump_parsed_flags(vec![input], DumpFormat::Text).unwrap();

        let text = std::str::from_utf8(&bytes).unwrap();

        assert!(text.contains("com.android.aconfig.test/disabled_ro: DISABLED READ_ONLY"));

        assert!(text.contains("com.android.aconfig.test/disabled_ro: READ_ONLY + DISABLED"));

    }



    #[test]