Simply Replace libchrome StringToXXs with android base ones am: 3357e27882
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3310800
Change-Id: I4e8fde2a34d0dba2665b887e423d76d23e48a533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aosp/update_attempter_android.cc b/aosp/update_attempter_android.cc
index 857685f..6b05603 100644
--- a/aosp/update_attempter_android.cc
+++ b/aosp/update_attempter_android.cc
@@ -24,11 +24,11 @@
#include <vector>
#include <android-base/parsebool.h>
+#include <android-base/parseint.h>
#include <android-base/properties.h>
#include <android-base/unique_fd.h>
#include <base/bind.h>
#include <base/logging.h>
-#include <base/strings/string_number_conversions.h>
#include <brillo/data_encoding.h>
#include <brillo/message_loops/message_loop.h>
#include <brillo/strings/string_utils.h>
@@ -113,7 +113,7 @@
bool GetHeaderAsBool(const string& header, bool default_value) {
int value = 0;
- if (base::StringToInt(header, &value) && (value == 0 || value == 1))
+ if (android::base::ParseInt(header, &value) && (value == 0 || value == 1))
return value == 1;
return default_value;
}
@@ -274,8 +274,8 @@
InstallPlan::Payload payload;
payload.size = payload_size;
if (!payload.size) {
- if (!base::StringToUint64(headers[kPayloadPropertyFileSize],
- &payload.size)) {
+ if (!android::base::ParseUint<uint64_t>(headers[kPayloadPropertyFileSize],
+ &payload.size)) {
payload.size = 0;
}
}
@@ -284,8 +284,8 @@
LOG(WARNING) << "Unable to decode base64 file hash: "
<< headers[kPayloadPropertyFileHash];
}
- if (!base::StringToUint64(headers[kPayloadPropertyMetadataSize],
- &payload.metadata_size)) {
+ if (!android::base::ParseUint<uint64_t>(headers[kPayloadPropertyMetadataSize],
+ &payload.metadata_size)) {
payload.metadata_size = 0;
}
// The |payload.type| is not used anymore since minor_version 3.
@@ -340,8 +340,8 @@
NetworkId network_id = kDefaultNetworkId;
if (!headers[kPayloadPropertyNetworkId].empty()) {
- if (!base::StringToUint64(headers[kPayloadPropertyNetworkId],
- &network_id)) {
+ if (!android::base::ParseUint<uint64_t>(headers[kPayloadPropertyNetworkId],
+ &network_id)) {
return LogAndSetGenericError(
error,
__LINE__,
diff --git a/common/prefs.cc b/common/prefs.cc
index 77078cf..8a727ae 100644
--- a/common/prefs.cc
+++ b/common/prefs.cc
@@ -21,6 +21,7 @@
#include <unistd.h>
#include <android-base/file.h>
+#include <android-base/parseint.h>
#include <base/files/file_enumerator.h>
#include <base/files/file_util.h>
#include <base/logging.h>
@@ -79,7 +80,7 @@
<< ", got an empty value after trim";
return false;
}
- if (!base::StringToInt64(str_value, value)) {
+ if (!android::base::ParseInt<int64_t>(str_value, value)) {
LOG(ERROR) << "When reading pref " << key << ", failed to convert value "
<< str_value << " to integer";
return false;
diff --git a/payload_consumer/delta_performer_unittest.cc b/payload_consumer/delta_performer_unittest.cc
index 0149aa0..0e29ddf 100644
--- a/payload_consumer/delta_performer_unittest.cc
+++ b/payload_consumer/delta_performer_unittest.cc
@@ -25,10 +25,10 @@
#include <string>
#include <vector>
+#include <android-base/parseint.h>
#include <base/files/file_path.h>
#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
-#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include <brillo/secure_blob.h>
@@ -1078,7 +1078,8 @@
string major_version_str;
uint64_t major_version{};
EXPECT_TRUE(store.GetString("PAYLOAD_MAJOR_VERSION", &major_version_str));
- EXPECT_TRUE(base::StringToUint64(major_version_str, &major_version));
+ EXPECT_TRUE(
+ android::base::ParseUint<uint64_t>(major_version_str, &major_version));
EXPECT_EQ(kMaxSupportedMajorPayloadVersion, major_version);
}
diff --git a/payload_generator/mapfile_filesystem.cc b/payload_generator/mapfile_filesystem.cc
index 5bca577..c9b4cd5 100644
--- a/payload_generator/mapfile_filesystem.cc
+++ b/payload_generator/mapfile_filesystem.cc
@@ -19,10 +19,10 @@
#include <algorithm>
#include <map>
+#include <android-base/parseint.h>
#include <base/files/file_util.h>
#include <base/logging.h>
#include <base/memory/ptr_util.h>
-#include <base/strings/string_number_conversions.h>
#include <base/strings/string_split.h>
#include "update_engine/common/utils.h"
@@ -98,11 +98,14 @@
line.substr(delim + 1, last_delim - (delim + 1)).as_string();
size_t dash = blocks.find('-', 0);
uint64_t block_start, block_end;
- if (dash == string::npos && base::StringToUint64(blocks, &block_start)) {
+ if (dash == string::npos &&
+ android::base::ParseUint<uint64_t>(blocks, &block_start)) {
mapped_file.extents.push_back(ExtentForRange(block_start, 1));
} else if (dash != string::npos &&
- base::StringToUint64(blocks.substr(0, dash), &block_start) &&
- base::StringToUint64(blocks.substr(dash + 1), &block_end)) {
+ android::base::ParseUint<uint64_t>(blocks.substr(0, dash),
+ &block_start) &&
+ android::base::ParseUint<uint64_t>(blocks.substr(dash + 1),
+ &block_end)) {
if (block_end < block_start) {
LOG(ERROR) << "End block " << block_end
<< " is smaller than start block " << block_start
diff --git a/payload_generator/payload_generation_config_android.cc b/payload_generator/payload_generation_config_android.cc
index d950092..1abdd55 100644
--- a/payload_generator/payload_generation_config_android.cc
+++ b/payload_generator/payload_generation_config_android.cc
@@ -16,6 +16,7 @@
#include "update_engine/payload_generator/payload_generation_config.h"
+#include <android-base/parseint.h>
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_split.h>
@@ -187,13 +188,13 @@
base::StringToSizeT(verity_table[4], &hash_block_size));
TEST_AND_RETURN_FALSE(block_size == hash_block_size);
uint64_t num_data_blocks = 0;
- TEST_AND_RETURN_FALSE(
- base::StringToUint64(verity_table[5], &num_data_blocks));
+ TEST_AND_RETURN_FALSE(android::base::ParseUint<uint64_t>(
+ verity_table[5], &num_data_blocks));
part.verity.hash_tree_data_extent =
ExtentForRange(0, num_data_blocks);
uint64_t hash_start_block = 0;
- TEST_AND_RETURN_FALSE(
- base::StringToUint64(verity_table[6], &hash_start_block));
+ TEST_AND_RETURN_FALSE(android::base::ParseUint<uint64_t>(
+ verity_table[6], &hash_start_block));
part.verity.hash_tree_algorithm = verity_table[7];
TEST_AND_RETURN_FALSE(base::HexStringToBytes(
verity_table[9], &part.verity.hash_tree_salt));