commit 888c4e9a35a8d2962a41ab6c3847a049eae5ad64
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 20 10:15:35 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 20 10:15:35 2022 +0000
tree 6b97ca3937f31363562e333f884b2a6b82ef41a1
parent 1f5abee8999dba86d1593b37b08cf74c77497b92
parent 8457db6cf317a376fd3b725f615cd460fc1f7648

Merge "count receivers in hasTooManyComponents"

services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java

diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
index 2626bb4..16f5d16 100644
--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
@@ -452,6 +452,9 @@
     List<ParsedProvider> getProviders();
 
     @NonNull
+    List<ParsedActivity> getReceivers();
+
+    @NonNull
     List<String> getRequestedPermissions();
 
     @Nullable

services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java

diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
index 952adda..c6e1793 100644
--- 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 @@
     }
 
     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;
     }
 
     /**