summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceUtils.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2018-08-07 16:51:24 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-08-07 16:51:24 +0000
commite80b45506501815061b079dcb10bf87443bd385d (patch)
tree4d74a37a2b5bab1dfa593dd0b1565cd42b720c16 /libs/androidfw/ResourceUtils.cpp
parent38c9e614af1f516f44f2a74fb9d0ec6963f809a8 (diff)
parent02857a72198613a0583cdf6863edb2df59beee04 (diff)
Merge "Merge Android Pie into master"
Diffstat (limited to 'libs/androidfw/ResourceUtils.cpp')
-rw-r--r--libs/androidfw/ResourceUtils.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/androidfw/ResourceUtils.cpp b/libs/androidfw/ResourceUtils.cpp
index 1aa6cf6da28d..d63feb01ef83 100644
--- a/libs/androidfw/ResourceUtils.cpp
+++ b/libs/androidfw/ResourceUtils.cpp
@@ -26,6 +26,9 @@ bool ExtractResourceName(const StringPiece& str, StringPiece* out_package, Strin
bool has_type_separator = false;
const char* start = str.data();
const char* end = start + str.size();
+ if (start[0] == '@') {
+ start++;
+ }
const char* current = start;
while (current != end) {
if (out_type->size() == 0 && *current == '/') {