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

Commit d01fd996 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

[res] Optimize Idmap actor matching 

Only perform the actor matching for overlayable.xml definitions
if current device defines some actors. Most of the devices do
not, making all the overlayable loading, parsing and getting
work to go to waste

Bug: 282215580
Test: build + boot + presubmits
Change-Id: I4256ef7d6a8dc0e27485415a5ef721a341156849
parent d2d7a20f

services/core/java/com/android/server/om/IdmapManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -257,7 +257,7 @@ final class IdmapManager { 
    private boolean matchesActorSignature(@NonNull AndroidPackage targetPackage,

    private boolean matchesActorSignature(@NonNull AndroidPackage targetPackage,

            @NonNull AndroidPackage overlayPackage, int userId) {

            @NonNull AndroidPackage overlayPackage, int userId) {

        String targetOverlayableName = overlayPackage.getOverlayTargetOverlayableName();

        String targetOverlayableName = overlayPackage.getOverlayTargetOverlayableName();

        if (targetOverlayableName != null) {

        if (targetOverlayableName != null && !mPackageManager.getNamedActors().isEmpty()) {

            try {

            try {

                OverlayableInfo overlayableInfo = mPackageManager.getOverlayableForTarget(

                OverlayableInfo overlayableInfo = mPackageManager.getOverlayableForTarget(

                        targetPackage.getPackageName(), targetOverlayableName, userId);

                        targetPackage.getPackageName(), targetOverlayableName, userId);