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

Commit c96bf2ca authored by Oriol Prieto Gascó's avatar Oriol Prieto Gascó Committed by Gerrit Code Review
Browse files

Merge "Add is_exported field to aconfig.proto" into main

parents f37973cc 0b9d289e

tools/aconfig/protos/aconfig.proto

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ message flag_declaration { 
  optional string description = 3;

  repeated string bug = 4;

  optional bool is_fixed_read_only = 5;

  optional bool is_exported = 6;

};



message flag_declarations {
@@ -77,6 +78,8 @@ message parsed_flag { 
  optional flag_permission permission = 7;

  repeated tracepoint trace = 8;

  optional bool is_fixed_read_only = 9;

  optional bool is_exported = 10;



}



message parsed_flags {

tools/aconfig/src/commands.rs

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ pub fn parse_flags( 
            };

            parsed_flag.set_permission(flag_permission);

            parsed_flag.set_is_fixed_read_only(flag_declaration.is_fixed_read_only());

            parsed_flag.set_is_exported(flag_declaration.is_exported());

            let mut tracepoint = ProtoTracepoint::new();

            tracepoint.set_source(input.source.clone());

            tracepoint.set_state(DEFAULT_FLAG_STATE);

tools/aconfig/src/protos.rs

+3 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ flag { 
    namespace: "first_ns"

    description: "This is the description of the first flag."

    bug: "123"

    is_exported: true

}

flag {

    name: "second"
@@ -326,12 +327,14 @@ flag { 
        assert_eq!(first.description(), "This is the description of the first flag.");

        assert_eq!(first.bug, vec!["123"]);

        assert!(!first.is_fixed_read_only());

        assert!(first.is_exported());

        let second = flag_declarations.flag.iter().find(|pf| pf.name() == "second").unwrap();

        assert_eq!(second.name(), "second");

        assert_eq!(second.namespace(), "second_ns");

        assert_eq!(second.description(), "This is the description of the second flag.");

        assert_eq!(second.bug, vec!["abc"]);

        assert!(second.is_fixed_read_only());

        assert!(!second.is_exported());



        // bad input: missing package in flag declarations

        let error = flag_declarations::try_from_text_proto(

tools/aconfig/src/test.rs

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ parsed_flag { 
    permission: READ_ONLY

  }

  is_fixed_read_only: false

  is_exported: false

}

parsed_flag {

  package: "com.android.aconfig.test"
@@ -57,6 +58,7 @@ parsed_flag { 
    permission: READ_WRITE

  }

  is_fixed_read_only: false

  is_exported: true

}

parsed_flag {

  package: "com.android.aconfig.test"
@@ -77,6 +79,7 @@ parsed_flag { 
    permission: READ_WRITE

  }

  is_fixed_read_only: false

  is_exported: false

}

parsed_flag {

  package: "com.android.aconfig.test"
@@ -97,6 +100,7 @@ parsed_flag { 
    permission: READ_ONLY

  }

  is_fixed_read_only: true

  is_exported: false

}

parsed_flag {

  package: "com.android.aconfig.test"
@@ -122,6 +126,7 @@ parsed_flag { 
    permission: READ_ONLY

  }

  is_fixed_read_only: false

  is_exported: false

}

parsed_flag {

  package: "com.android.aconfig.test"
@@ -142,6 +147,7 @@ parsed_flag { 
    permission: READ_WRITE

  }

  is_fixed_read_only: false

  is_exported: false

}

"#;

tools/aconfig/tests/test.aconfig

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ flag { 
    namespace: "aconfig_test"

    description: "This flag is DISABLED + READ_WRITE"

    bug: "456"

    is_exported: true

}



# This flag's final value calculated from: