diff options
author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /healthd/AnimationParser.h | |
parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'healthd/AnimationParser.h')
-rw-r--r-- | healthd/AnimationParser.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/healthd/AnimationParser.h b/healthd/AnimationParser.h index bc0084518..f55b5635e 100644 --- a/healthd/AnimationParser.h +++ b/healthd/AnimationParser.h @@ -17,6 +17,8 @@ #ifndef HEALTHD_ANIMATION_PARSER_H #define HEALTHD_ANIMATION_PARSER_H +#include <string_view> + #include "animation.h" namespace android { @@ -24,7 +26,7 @@ namespace android { bool parse_animation_desc(const std::string& content, animation* anim); bool can_ignore_line(const char* str); -bool remove_prefix(const std::string& str, const char* prefix, const char** rest); +bool remove_prefix(std::string_view str, const char* prefix, const char** rest); bool parse_text_field(const char* in, animation::text_field* field); } // namespace android |