Make all char* in android's build_info std::strings
There used to be a comment about needing to use char* instead of std::string, but I think that's obsolete, since I couldn't find any uses of these build_info fields during crash time. They all seem to be set beforehand. Bug: 414609682 Change-Id: I5fb795b2701e25c74cf604adf14f8f0c73a4c486 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6526386 Commit-Queue: Sam Maier <smaier@chromium.org> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Owners-Override: Sam Maier <smaier@chromium.org> Cr-Commit-Position: refs/heads/main@{#1459610}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
4feb0cc824
commit
05ccd44feb
base
android
android_info.ccandroid_info.hapk_info.ccapk_info.hbuild_info.ccbuild_info.hdevice_info.ccdevice_info.h
java
src
org
chromium
tracing
components
gpu
services/tracing/public/cpp/perfetto
ui/gl
@ -42,9 +42,9 @@ void MetadataDataSource::WriteMetadata() {
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID) && defined(OFFICIAL_BUILD)
|
||||
// Version code is only set for official builds on Android.
|
||||
const char* version_code_str =
|
||||
const std::string& version_code_str =
|
||||
base::android::BuildInfo::GetInstance()->package_version_code();
|
||||
if (version_code_str) {
|
||||
if (!version_code_str.empty()) {
|
||||
int version_code = 0;
|
||||
bool res = base::StringToInt(version_code_str, &version_code);
|
||||
DCHECK(res);
|
||||
|
@ -127,9 +127,9 @@ void TraceEventMetadataSource::WriteMetadataPacket(
|
||||
bool privacy_filtering_enabled) {
|
||||
#if BUILDFLAG(IS_ANDROID) && defined(OFFICIAL_BUILD)
|
||||
// Version code is only set for official builds on Android.
|
||||
const char* version_code_str =
|
||||
const std::string& version_code_str =
|
||||
base::android::BuildInfo::GetInstance()->package_version_code();
|
||||
if (version_code_str) {
|
||||
if (!version_code_str.empty()) {
|
||||
int version_code = 0;
|
||||
bool res = base::StringToInt(version_code_str, &version_code);
|
||||
DCHECK(res);
|
||||
|
Reference in New Issue
Block a user