commit ef40d2e832e900aba6dbcf8217903d7dbe689ca0
author Ryan Mitchell <rtmitchell@google.com> Wed Mar 11 10:26:08 2020 -0700
committer Ryan Mitchell <rtmitchell@google.com> Thu Mar 19 18:33:55 2020 -0700
tree 96e56c54d587a36b13889d3eac4d89682000a625
parent ad2d924b3490c01168ad1dfeb2fa05ebc61b8ef2

Refactor ApkAsset loading APIs

To add the partner requested ResourcesProvider#loadFromDir APIs, this
change adds format type integer that allows us to reduce the number of
ApkAssets loading overrides.

This change also adds hidden offset and length based ResourcesProvider
APIs that could not make R.

Bug: 142716192
Test: atest FrameworksResourceLoaderTests
Change-Id: I926fde257cae701901dcd4ca408024feae8c90a6
Merged-In: I926fde257cae701901dcd4ca408024feae8c90a6

libs/androidfw/LoadedArsc.cpp

diff --git a/libs/androidfw/LoadedArsc.cpp b/libs/androidfw/LoadedArsc.cpp
index e35c024..70bb441 100644
--- a/libs/androidfw/LoadedArsc.cpp
+++ b/libs/androidfw/LoadedArsc.cpp
@@ -749,7 +749,7 @@
 
 std::unique_ptr<const LoadedArsc> LoadedArsc::Load(const StringPiece& data,
                                                    const LoadedIdmap* loaded_idmap,
-                                                   package_property_t property_flags) {
+                                                   const package_property_t property_flags) {
   ATRACE_NAME("LoadedArsc::Load");
 
   // Not using make_unique because the constructor is private.