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

Commit 4501156e authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge "fix init flag parsing" am: bb3440c6 am: dae414c2 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1524421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bf3c6d45f2261244a279b71d6d1d779d3097975
parents 4cc1ce6b dae414c2

system/gd/common/init_flags.cc

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ bool ParseBoolFlag(const std::vector<std::string>& flag_pair, const std::string& 
}



void InitFlags::Load(const char** flags) {

  const char** flags_copy = flags;

  SetAll(false);

  while (flags != nullptr && *flags != nullptr) {

    std::string flag_element = *flags;
@@ -80,6 +81,7 @@ void InitFlags::Load(const char** flags) { 
    }

  }



  flags = flags_copy;

  rust::Vec<rust::String> rusted_flags = rust::Vec<rust::String>();

  while (flags != nullptr && *flags != nullptr) {

    rusted_flags.push_back(rust::String(*flags));