commit e33d43c7a1e6f21703b62f1508ffec459dea268c
author Yurii Zubrytskyi <zyy@google.com> Mon Feb 12 22:44:07 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 12 22:44:07 2024 +0000
tree 967e8fa060d37a8841f3e0e081e858a54a08d3e7
parent 218915a6181a6d4af35dbe6b95a9af291bc8c5bb
parent d01fd99621e6905d01d55ba40b4b4f397d02d239

Merge "[res] Optimize Idmap actor matching" into main

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

diff --git a/services/core/java/com/android/server/om/IdmapManager.java b/services/core/java/com/android/server/om/IdmapManager.java
index 25a39cc..86d05d9 100644
--- a/services/core/java/com/android/server/om/IdmapManager.java
+++ b/services/core/java/com/android/server/om/IdmapManager.java
@@ -257,7 +257,7 @@
     private boolean matchesActorSignature(@NonNull AndroidPackage targetPackage,
             @NonNull AndroidPackage overlayPackage, int userId) {
         String targetOverlayableName = overlayPackage.getOverlayTargetOverlayableName();
-        if (targetOverlayableName != null) {
+        if (targetOverlayableName != null && !mPackageManager.getNamedActors().isEmpty()) {
             try {
                 OverlayableInfo overlayableInfo = mPackageManager.getOverlayableForTarget(
                         targetPackage.getPackageName(), targetOverlayableName, userId);