diff options
| author | Daniel Norman <danielnorman@google.com> | 2021-02-08 11:11:18 -0800 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-02-17 08:39:59 -0800 |
| commit | 337095f9d277c566cb888bc3adbac16576f1ae70 (patch) | |
| tree | 8818a5cd44fdfa89f7ef4d8570dbc67239e087dd /libs/androidfw/Idmap.cpp | |
| parent | 80b7ed3f7373212a33fe42af8a7b7fc0ebcb187c (diff) | |
| parent | a66768631e6f47e1f7ffcf4ec86f96d6e8f35282 (diff) | |
Merge SP1A.210208.001
Change-Id: I7d4929024872b369444e276a60ded06e37b1fefb
Diffstat (limited to 'libs/androidfw/Idmap.cpp')
| -rw-r--r-- | libs/androidfw/Idmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/Idmap.cpp b/libs/androidfw/Idmap.cpp index adb383f95d40..f216f55771c2 100644 --- a/libs/androidfw/Idmap.cpp +++ b/libs/androidfw/Idmap.cpp @@ -257,8 +257,8 @@ LoadedIdmap::LoadedIdmap(std::string&& idmap_path, target_apk_path_(target_apk_path), idmap_last_mod_time_(getFileModDate(idmap_path_.data())) {} -std::unique_ptr<const LoadedIdmap> LoadedIdmap::Load(const StringPiece& idmap_path, - const StringPiece& idmap_data) { +std::unique_ptr<LoadedIdmap> LoadedIdmap::Load(const StringPiece& idmap_path, + const StringPiece& idmap_data) { ATRACE_CALL(); size_t data_size = idmap_data.size(); auto data_ptr = reinterpret_cast<const uint8_t*>(idmap_data.data()); |