Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix clang-tidy performance-faster-string-find warnings" am: 57fb318ca3

Browse Source 
Change-Id: Icdf5d2931d8e2503f0c2ebc5c7f87d349fdc59a8
This commit is contained in:
Automerger Merge Worker
2020-02-12 00:14:47 +00:00
parent f1e6950510 57fb318ca3
commit 7c0f0d3cec
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
startop/view_compiler/dex_layout_compiler.cc
View File

@@ -118,7 +118,7 @@ namespace {
std::string ResolveName(const std::string& name) { std::string ResolveName(const std::string& name) {
if (name == "View") return "android.view.View"; if (name == "View") return "android.view.View";
if (name == "ViewGroup") return "android.view.ViewGroup"; if (name == "ViewGroup") return "android.view.ViewGroup";
if (name.find(".") == std::string::npos) { if (name.find('.') == std::string::npos) {
return StringPrintf("android.widget.%s", name.c_str()); return StringPrintf("android.widget.%s", name.c_str());
} }
return name; return name;
@@ -205,4 +205,4 @@ void DexViewBuilder::PopViewStack() {
view_stack_.pop_back(); view_stack_.pop_back();
} }
} // namespace startop } // namespace startop

4
startop/view_compiler/util.cc
View File

@@ -23,13 +23,13 @@ namespace util {
// TODO: see if we can borrow this from somewhere else, like aapt2. // TODO: see if we can borrow this from somewhere else, like aapt2.
string FindLayoutNameFromFilename(const string& filename) { string FindLayoutNameFromFilename(const string& filename) {
size_t start = filename.rfind("/"); size_t start = filename.rfind('/');
if (start == string::npos) { if (start == string::npos) {
start = 0; start = 0;
} else { } else {
start++; // advance past '/' character start++; // advance past '/' character
} }
size_t end = filename.find(".", start); size_t end = filename.find('.', start);
return filename.substr(start, end - start); return filename.substr(start, end - start);
} }

4
tools/aapt2/dump/DumpManifest.cpp
View File

@@ -1175,7 +1175,7 @@ class Activity : public ManifestExtractor::Element {
} }
// Fully qualify the activity name // Fully qualify the activity name
ssize_t idx = name.find("."); ssize_t idx = name.find('.');
if (idx == 0) { if (idx == 0) {
name = package + name; name = package + name;
} else if (idx < 0) { } else if (idx < 0) {
@@ -2125,7 +2125,7 @@ bool ManifestExtractor::Dump(text::Printer* printer, IDiagnostics* diag) {
size_t pos = file_path.find("lib/"); size_t pos = file_path.find("lib/");
if (pos != std::string::npos) { if (pos != std::string::npos) {
file_path = file_path.substr(pos + 4); file_path = file_path.substr(pos + 4);
pos = file_path.find("/"); pos = file_path.find('/');
if (pos != std::string::npos) { if (pos != std::string::npos) {
file_path = file_path.substr(0, pos); file_path = file_path.substr(0, pos);
} }

2
tools/aapt2/java/ManifestClassGenerator.cpp
View File

@@ -39,7 +39,7 @@ static Maybe<std::string> ExtractJavaIdentifier(IDiagnostics* diag, const Source
} }
// Normalize only the java identifier, leave the original value unchanged. // Normalize only the java identifier, leave the original value unchanged.
if (result.find("-") != std::string::npos) { if (result.find('-') != std::string::npos) {
result = JavaClassGenerator::TransformToFieldName(result); result = JavaClassGenerator::TransformToFieldName(result);
} }