Merge "count receivers in hasTooManyComponents"

2022-12-20 10:15:35 +00:00
parent 1f5abee899 8457db6cf3
commit 888c4e9a35
2 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
@@ -451,6 +451,9 @@ public interface ParsingPackage {
    @NonNull
    List<ParsedProvider> getProviders();

+    @NonNull
+    List<ParsedActivity> getReceivers();
+
    @NonNull
    List<String> getRequestedPermissions();

--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
@@ -824,8 +824,8 @@ public class ParsingPackageUtils {
    }

    private static boolean hasTooManyComponents(ParsingPackage pkg) {
-        return pkg.getActivities().size() + pkg.getServices().size() + pkg.getProviders().size()
-                > MAX_NUM_COMPONENTS;
+        return (pkg.getActivities().size() + pkg.getServices().size() + pkg.getProviders().size()
+                + pkg.getReceivers().size()) > MAX_NUM_COMPONENTS;
    }

    /**