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

Commit 3bffbb95 authored by Iurii Makhno's avatar Iurii Makhno Committed by Android (Google) Code Review
Browse files

Merge "Expose default ('--_--') locale in proto format."

parents effb3653 cfc559b1

tools/aapt2/dump/DumpManifest.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2845,7 +2845,9 @@ bool ManifestExtractor::DumpProto(pb::Badging* out_badging) { 
  supports_screen_->ToProtoScreens(out_badging, target_sdk_);



  for (auto& config : locales_) {

    if (!config.first.empty()) {

    if (config.first.empty()) {

      out_badging->add_locales("--_--");

    } else {

      out_badging->add_locales(config.first);

    }

  }

tools/aapt2/integration-tests/DumpTest/components_expected_proto.txt

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ badging { 
    provided_components: "camera"

    provided_components: "camera-secure"

  }

  locales: "--_--"

  densities: 160

  densities: 240

  densities: 320

tools/aapt2/integration-tests/DumpTest/components_full_proto.txt

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ badging { 
    provided_components: "camera"

    provided_components: "camera-secure"

  }

  locales: "--_--"

  densities: 160

  densities: 240

  densities: 320