From 198234502b45449bd3a1e18ba22e8ffd1267657a Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Tue, 29 Jan 2019 12:01:24 -0800 Subject: Enforce overlayable API when defined If a package defines overlayable resources, then do not allow resources that are not defined as overlayable to be overlaid. Bug:123600120 Test: idmap2_tests and cts-tradefed run cts -m CtsRROTestCases Change-Id: I35120a97ccf4650e67c7ba65a60f4f3c51b0e627 --- libs/androidfw/LoadedArsc.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'libs/androidfw/LoadedArsc.cpp') diff --git a/libs/androidfw/LoadedArsc.cpp b/libs/androidfw/LoadedArsc.cpp index 70ce9bc705ef..bdd47061054a 100644 --- a/libs/androidfw/LoadedArsc.cpp +++ b/libs/androidfw/LoadedArsc.cpp @@ -633,6 +633,7 @@ std::unique_ptr LoadedPackage::Load(const Chunk& chunk, overlayable_info.actor = actor; overlayable_info.policy_flags = policy_header->policy_flags; loaded_package->overlayable_infos_.push_back(std::make_pair(overlayable_info, ids)); + loaded_package->defines_overlayable_ = true; break; } -- cgit v1.2.3-59-g8ed1b