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

Commit ffcb57de authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "The libc++ upgrade means we can use contains in minadb now." into main

parents ed71bac1 6e19fb26

install/adb_install.cpp

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static bool HandleMessageFromMinadbd(int socket_fd, 
  if (command_type == MinadbdCommand::kError) {

    return false;

  }

  if (command_map.find(command_type) == command_map.end()) {

  if (!command_map.contains(command_type)) {

    LOG(ERROR) << "Unsupported command: "

               << android::base::get_unaligned<unsigned int>(

                      message.substr(strlen(kMinadbdCommandPrefix)).c_str());

minadbd/minadbd_services.cpp

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static void RescueGetpropHostService(unique_fd sfd, const std::string& prop) { 
      }

      result += "[" + key + "]: [" + value + "]\n";

    }

  } else if (kGetpropAllowedProps.find(prop) != kGetpropAllowedProps.end()) {

  } else if (kGetpropAllowedProps.contains(prop)) {

    result = query_prop(prop) + "\n";

  }

  if (result.empty()) {