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 am: 7c0f0d3cec am: 40ef6319ca

Browse Source 
Change-Id: Id9d31a0c5cf41a0bb4a58326faa79511a1d8cc4a
This commit is contained in:
Automerger Merge Worker
2020-02-12 00:53:37 +00:00
parent 5040954f68 40ef6319ca
commit 0b49886dca
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) {
if (name == "View") return "android.view.View";
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 name;
@@ -205,4 +205,4 @@ void DexViewBuilder::PopViewStack() {
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.
string FindLayoutNameFromFilename(const string& filename) {
size_t start = filename.rfind("/");
size_t start = filename.rfind('/');
if (start == string::npos) {
start = 0;
} else {
start++; // advance past '/' character
}
size_t end = filename.find(".", start);
size_t end = filename.find('.', start);
return filename.substr(start, end - start);
}