diff options
| author | 2023-08-18 19:43:38 +0000 | |
|---|---|---|
| committer | 2023-08-18 19:43:38 +0000 | |
| commit | 9836a1cebb1a95112140c96fad1104d191de391e (patch) | |
| tree | b2868830f6884bd31c5444feee6708293c97156a /libs/androidfw/ConfigDescription.cpp | |
| parent | 5eef9a145702b2069656ff6cfd147adfe1adbaab (diff) | |
| parent | 0e91b7269483d6392203606b3a766807d175b4ba (diff) | |
Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp am: b370693c67 am: 64441287a5 am: 0e91b72694
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24484497
Change-Id: I1436ad48bfcbe44c5fc67d41f76cd86cd6a62048
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 { |