diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2019-01-15 19:34:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-15 19:34:30 +0000 |
| commit | cf9dd94323e0bf4934281582a1851e60f1fa36ac (patch) | |
| tree | 1a7a160c3f03987d1929a6c23717f0ffb78bd040 /libs/androidfw/tests | |
| parent | edb5e1a1b8e6791f85040a6b602d5c7929260be7 (diff) | |
| parent | ef5673a4c4021ca27b40e48020203928d71c95a8 (diff) | |
Merge "Add encoding of name and actor overlayable fields"
Diffstat (limited to 'libs/androidfw/tests')
| -rw-r--r-- | libs/androidfw/tests/LoadedArsc_test.cpp | 8 | ||||
| -rw-r--r-- | libs/androidfw/tests/data/overlayable/overlayable.apk | bin | 1387 -> 5523 bytes | |||
| -rw-r--r-- | libs/androidfw/tests/data/overlayable/res/values/overlayable.xml | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libs/androidfw/tests/LoadedArsc_test.cpp b/libs/androidfw/tests/LoadedArsc_test.cpp index 22d587a7f5c4..2e386a083185 100644 --- a/libs/androidfw/tests/LoadedArsc_test.cpp +++ b/libs/androidfw/tests/LoadedArsc_test.cpp @@ -294,22 +294,30 @@ TEST(LoadedArscTest, LoadOverlayable) { info = package->GetOverlayableInfo(overlayable::R::string::overlayable1); ASSERT_THAT(info, NotNull()); + EXPECT_THAT(info->name, Eq("OverlayableResources1")); + EXPECT_THAT(info->actor, Eq("overlay://theme")); EXPECT_THAT(info->policy_flags, Eq(ResTable_overlayable_policy_header::POLICY_PUBLIC)); info = package->GetOverlayableInfo(overlayable::R::string::overlayable2); ASSERT_THAT(info, NotNull()); + EXPECT_THAT(info->name, Eq("OverlayableResources1")); + EXPECT_THAT(info->actor, Eq("overlay://theme")); EXPECT_THAT(info->policy_flags, Eq(ResTable_overlayable_policy_header::POLICY_SYSTEM_PARTITION | ResTable_overlayable_policy_header::POLICY_PRODUCT_PARTITION)); info = package->GetOverlayableInfo(overlayable::R::string::overlayable3); ASSERT_THAT(info, NotNull()); + EXPECT_THAT(info->name, Eq("OverlayableResources2")); + EXPECT_THAT(info->actor, Eq("overlay://com.android.overlayable")); EXPECT_THAT(info->policy_flags, Eq(ResTable_overlayable_policy_header::POLICY_VENDOR_PARTITION | ResTable_overlayable_policy_header::POLICY_PRODUCT_SERVICES_PARTITION | ResTable_overlayable_policy_header::POLICY_PRODUCT_PARTITION)); info = package->GetOverlayableInfo(overlayable::R::string::overlayable4); + EXPECT_THAT(info->name, Eq("OverlayableResources1")); + EXPECT_THAT(info->actor, Eq("overlay://theme")); ASSERT_THAT(info, NotNull()); EXPECT_THAT(info->policy_flags, Eq(ResTable_overlayable_policy_header::POLICY_PUBLIC)); } diff --git a/libs/androidfw/tests/data/overlayable/overlayable.apk b/libs/androidfw/tests/data/overlayable/overlayable.apk Binary files differindex 85ab4be7a2e5..863474794d00 100644 --- a/libs/androidfw/tests/data/overlayable/overlayable.apk +++ b/libs/androidfw/tests/data/overlayable/overlayable.apk diff --git a/libs/androidfw/tests/data/overlayable/res/values/overlayable.xml b/libs/androidfw/tests/data/overlayable/res/values/overlayable.xml index 11aa7354901d..dba7b08628f1 100644 --- a/libs/androidfw/tests/data/overlayable/res/values/overlayable.xml +++ b/libs/androidfw/tests/data/overlayable/res/values/overlayable.xml @@ -15,7 +15,7 @@ --> <resources> -<overlayable> +<overlayable name="OverlayableResources1" actor="overlay://theme"> <!-- Any overlay can overlay the value of @string/overlayable1 --> <item type="string" name="overlayable1" /> @@ -31,9 +31,9 @@ </policy> </overlayable> -<overlayable> +<overlayable name="OverlayableResources2" actor="overlay://com.android.overlayable"> <!-- Any overlay on the product_services, vendor, or product partition can overlay the value of - @string/overlayable3 --> + @string/overlayable3 --> <policy type="product_services|vendor|product"> <item type="string" name="overlayable3" /> </policy> |