commit 0e78ec20b9123957b056cedbc3c4185c2f55fb5c
author Tomasz Wasilczyk <twasilczyk@google.com> Fri Aug 11 16:11:15 2023 +0000
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 17 03:36:35 2023 +0000
tree 58191c32459ee51a073ea9d044c8d24d32f91cc8
parent 5505d7aa034056bdbeee81ba5bc78a297d6065a1

Use String8/16 c_str

Bug: 295394788
Test: make checkbuild
Change-Id: I857372f92281f4ffa508c583acfdd5537ad91f83

aosp/binder_service_android.cc

diff --git a/aosp/binder_service_android.cc b/aosp/binder_service_android.cc
index 0f4b768..37df9a5 100644
--- a/aosp/binder_service_android.cc
+++ b/aosp/binder_service_android.cc
@@ -99,7 +99,7 @@
     int64_t payload_offset,
     int64_t payload_size,
     const vector<android::String16>& header_kv_pairs) {
-  const string payload_url{android::String8{url}.string()};
+  const string payload_url{android::String8{url}.c_str()};
   vector<string> str_headers = ToVecString(header_kv_pairs);
 
   Error error;
@@ -157,7 +157,7 @@
     const android::String16& metadata_filename) {
   Error error;
   if (!service_delegate_->setShouldSwitchSlotOnReboot(
-          android::String8(metadata_filename).string(), &error)) {
+          android::String8(metadata_filename).c_str(), &error)) {
     return ErrorPtrToStatus(error);
   }
   return Status::ok();
@@ -174,7 +174,7 @@
 Status BinderUpdateEngineAndroidService::verifyPayloadApplicable(
     const android::String16& metadata_filename, bool* return_value) {
   const std::string payload_metadata{
-      android::String8{metadata_filename}.string()};
+      android::String8{metadata_filename}.c_str()};
   LOG(INFO) << "Received a request of verifying payload metadata in "
             << payload_metadata << ".";
   Error error;
@@ -205,7 +205,7 @@
     const vector<android::String16>& header_kv_pairs,
     int64_t* return_value) {
   const std::string payload_metadata{
-      android::String8{metadata_filename}.string()};
+      android::String8{metadata_filename}.c_str()};
   vector<string> str_headers = ToVecString(header_kv_pairs);
   LOG(INFO) << "Received a request of allocating space for " << payload_metadata
             << ".";

aosp/binder_service_android_common.h

diff --git a/aosp/binder_service_android_common.h b/aosp/binder_service_android_common.h
index eb3588d..636e98e 100644
--- a/aosp/binder_service_android_common.h
+++ b/aosp/binder_service_android_common.h
@@ -37,7 +37,7 @@
   std::vector<std::string> out;
   out.reserve(inp.size());
   for (const auto& e : inp) {
-    out.emplace_back(android::String8{e}.string());
+    out.emplace_back(android::String8{e}.c_str());
   }
   return out;
 }