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

Commit ab7e0d5a authored by Donald Chai's avatar Donald Chai
Browse files

Include the name of the resource in an error message. 

Bug: 153393440
Tested: N/A
Change-Id: I6979c683978af2670b1823ff8380175673067630
parent ea924e86

tools/aapt2/format/proto/ProtoDeserialize.cpp

+4 −2
Original line number Diff line number Diff line
@@ -490,8 +490,10 @@ static bool DeserializePackageFromPb(const pb::Package& pb_package, const ResStr 
        // Find the overlayable to which this item belongs

        pb::OverlayableItem pb_overlayable_item = pb_entry.overlayable_item();

        if (pb_overlayable_item.overlayable_idx() >= overlayables.size()) {

          *out_error = android::base::StringPrintf("invalid overlayable_idx value %d",

                                                   pb_overlayable_item.overlayable_idx());

          *out_error =

              android::base::StringPrintf("invalid overlayable_idx value %d for entry %s/%s",

                                          pb_overlayable_item.overlayable_idx(),

                                          pb_type.name().c_str(), pb_entry.name().c_str());

          return false;

        }