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

Commit 02d9c1e9 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Remove RRO policy product_services 

Since Q will no longer have a product_services partition, remove instances of
the product_services policy across aapt2, androidfw, and idmap2.

Bug:122745343
Test: aapt2_tests and libandroidfw_tests
Change-Id: I97c223a0bf5a2eab95811e5f738b44af6335e0ea
parent d10d06d0

libs/androidfw/include/androidfw/ResourceTypes.h

+0 −4
Original line number Diff line number Diff line
@@ -1643,10 +1643,6 @@ struct ResTable_overlayable_policy_header 
    // The overlay must reside of the product partition or must have existed on the product

    // partition before an upgrade to overlay these resources.

    POLICY_PRODUCT_PARTITION = 0x00000008,



    // The overlay must reside of the product services partition or must have existed on the product

    // services partition before an upgrade to overlay these resources.

    POLICY_PRODUCT_SERVICES_PARTITION = 0x00000010,

  };

  uint32_t policy_flags;

libs/androidfw/tests/LoadedArsc_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ TEST(LoadedArscTest, LoadOverlayable) { 
  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);

libs/androidfw/tests/data/overlayable/res/values/overlayable.xml

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
</overlayable>



<overlayable name="OverlayableResources2" actor="overlay://com.android.overlayable">

    <!-- Any overlay on the product_services, vendor, or product partition can overlay the value of

    <!-- Any overlay on the vendor or product partition can overlay the value of

        @string/overlayable3 -->

    <policy type="product_services|vendor|product">

    <policy type="vendor|product">

        <item type="string" name="overlayable3" />

    </policy>

</overlayable>

tools/aapt2/ResourceParser.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1164,8 +1164,6 @@ bool ResourceParser::ParseOverlayable(xml::XmlPullParser* parser, ParsedResource 
            current_policies |= OverlayableItem::Policy::kPublic;

          } else if (trimmed_part == "product") {

            current_policies |= OverlayableItem::Policy::kProduct;

          } else if (trimmed_part == "product_services") {

            current_policies |= OverlayableItem::Policy::kProductServices;

          } else if (trimmed_part == "system") {

            current_policies |= OverlayableItem::Policy::kSystem;

          } else if (trimmed_part == "vendor") {