diff options
author | Ryan Mitchell <rtmitchell@google.com> | 2020-05-29 23:00:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 23:00:50 +0000 |
commit | b04a16d744ebca79d4a7e9738a017515b682a249 (patch) | |
tree | c19c1b09d14684b9e35125b3042e5868d9948e37 /cmds/idmap2/libidmap2/ResourceMapping.cpp | |
parent | 23383e30acd36f7cbde2deb56f1dd84215e33227 (diff) | |
parent | 41b850d0a8bb33c33b70aa4a4716b1961d5abf00 (diff) |
Merge "Persist implicit overlay configurator actor policy" into rvc-dev am: 41b850d0a8
Change-Id: I9337e44ed7c662d26e0518cca1f93e00d2952e71
Diffstat (limited to 'cmds/idmap2/libidmap2/ResourceMapping.cpp')
-rw-r--r-- | cmds/idmap2/libidmap2/ResourceMapping.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/idmap2/libidmap2/ResourceMapping.cpp b/cmds/idmap2/libidmap2/ResourceMapping.cpp index f82c8f1af713..44acbcaf8ace 100644 --- a/cmds/idmap2/libidmap2/ResourceMapping.cpp +++ b/cmds/idmap2/libidmap2/ResourceMapping.cpp @@ -61,7 +61,8 @@ Result<Unit> CheckOverlayable(const LoadedPackage& target_package, const ResourceId& target_resource) { static constexpr const PolicyBitmask sDefaultPolicies = PolicyFlags::ODM_PARTITION | PolicyFlags::OEM_PARTITION | PolicyFlags::SYSTEM_PARTITION | - PolicyFlags::VENDOR_PARTITION | PolicyFlags::PRODUCT_PARTITION | PolicyFlags::SIGNATURE; + PolicyFlags::VENDOR_PARTITION | PolicyFlags::PRODUCT_PARTITION | PolicyFlags::SIGNATURE | + PolicyFlags::ACTOR_SIGNATURE; // If the resource does not have an overlayable definition, allow the resource to be overlaid if // the overlay is preinstalled or signed with the same signature as the target. |