diff options
| author | 2023-08-18 19:05:20 +0000 | |
|---|---|---|
| committer | 2023-08-18 19:05:20 +0000 | |
| commit | 0e91b7269483d6392203606b3a766807d175b4ba (patch) | |
| tree | 3e6115d21f56e650b4d5d27f360c5214df4a709d /libs/androidfw/ConfigDescription.cpp | |
| parent | 15a10db6b2dcc2d8405a12405dc26779b595497e (diff) | |
| parent | 64441287a544d12f14e526e8cffac5085ea1c1b5 (diff) | |
Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp am: b370693c67 am: 64441287a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24484497
Change-Id: Ic55aa0d2e9130860c20029ad43799502cc17d1e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
| -rw-r--r-- | libs/androidfw/ConfigDescription.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/ConfigDescription.cpp b/libs/androidfw/ConfigDescription.cpp index cf2fd6f59b87..e08030c4cca5 100644 --- a/libs/androidfw/ConfigDescription.cpp +++ b/libs/androidfw/ConfigDescription.cpp @@ -905,7 +905,7 @@ std::string ConfigDescription::GetBcp47LanguageTag(bool canonicalize) const { std::string ConfigDescription::to_string() const { const String8 str = toString(); - return std::string(str.string(), str.size()); + return std::string(str.c_str(), str.size()); } bool ConfigDescription::Dominates(const ConfigDescription& o) const { |