Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62a5d424 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "idmap2-prerequisites" 

* changes:
  AssetManager2: optionally keep non-matching configs
  AAPT2: optionally keep resources without default value
  libandroidfw: add resource ID iterator
parents 16fcd3dc 668ec5bd

core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ LOCAL_PACKAGE_NAME := OverlayDeviceTests_AppOverlayOne 
LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)

core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ LOCAL_PACKAGE_NAME := OverlayDeviceTests_AppOverlayTwo 
LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)

core/tests/overlaytests/device/test-apps/FrameworkOverlay/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ LOCAL_PACKAGE_NAME := OverlayDeviceTests_FrameworkOverlay 
LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)

core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ LOCAL_PACKAGE_NAME := OverlayHostTests_UpdateOverlay 
LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)



my_package_prefix := com.android.server.om.hosttest.framework_overlay

libs/androidfw/AssetManager2.cpp

+4 −4
Original line number Diff line number Diff line
@@ -67,10 +67,10 @@ AssetManager2::AssetManager2() { 
}



bool AssetManager2::SetApkAssets(const std::vector<const ApkAssets*>& apk_assets,

                                 bool invalidate_caches) {

                                 bool invalidate_caches, bool filter_incompatible_configs) {

  apk_assets_ = apk_assets;

  BuildDynamicRefTable();

  RebuildFilterList();

  RebuildFilterList(filter_incompatible_configs);

  if (invalidate_caches) {

    InvalidateCaches(static_cast<uint32_t>(-1));

  }
@@ -825,7 +825,7 @@ uint32_t AssetManager2::GetResourceId(const std::string& resource_name, 
  return 0u;

}



void AssetManager2::RebuildFilterList() {

void AssetManager2::RebuildFilterList(bool filter_incompatible_configs) {

  for (PackageGroup& group : package_groups_) {

    for (ConfiguredPackage& impl : group.packages_) {

      // Destroy it.
@@ -841,7 +841,7 @@ void AssetManager2::RebuildFilterList() { 
        for (auto iter = spec->types; iter != iter_end; ++iter) {

          ResTable_config this_config;

          this_config.copyFromDtoH((*iter)->config);

          if (this_config.match(configuration_)) {

          if (!filter_incompatible_configs || this_config.match(configuration_)) {

            group.configurations.push_back(this_config);

            group.types.push_back(*iter);

          }