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

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

Merge "Fix idmap2 uninitialized variables" am: 6982a7dc 

Change-Id: If120ed5b4deb24b8b6e5a90ddcec986365736545
parents aecd5f0b 6982a7dc

cmds/idmap2/idmap2/Create.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ Result<Unit> Create(const std::vector<std::string>& args) { 
  std::string overlay_apk_path;

  std::string idmap_path;

  std::vector<std::string> policies;

  bool ignore_overlayable;

  bool ignore_overlayable = false;



  const CommandLineOptions opts =

      CommandLineOptions("idmap2 create")

cmds/idmap2/idmap2/Dump.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ using android::idmap2::Unit; 
Result<Unit> Dump(const std::vector<std::string>& args) {

  SYSTRACE << "Dump " << args;

  std::string idmap_path;

  bool verbose;

  bool verbose = false;



  const CommandLineOptions opts =

      CommandLineOptions("idmap2 dump")

cmds/idmap2/tests/Idmap2BinaryTests.cpp

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ TEST_F(Idmap2BinaryTests, Dump) { 
  ASSERT_NE(result->stdout.find("0x7f02000c -> 0x7f020000 string/str1"), std::string::npos);

  ASSERT_NE(result->stdout.find("0x7f02000e -> 0x7f020001 string/str3"), std::string::npos);

  ASSERT_NE(result->stdout.find("0x7f02000f -> 0x7f020002 string/str4"), std::string::npos);

  ASSERT_EQ(result->stdout.find("00000210:     007f  target package id"), std::string::npos);



  // clang-format off

  result = ExecuteBinary({"idmap2",