diff options
| author | 2022-12-18 21:27:43 -0800 | |
|---|---|---|
| committer | 2022-12-18 21:31:34 -0800 | |
| commit | 8457db6cf317a376fd3b725f615cd460fc1f7648 (patch) | |
| tree | b44d16be3e8ad95f6ff967e38b49d8b26d04585c | |
| parent | 5e6c1919a2264c4b6723dfa76caa42bec5c6a87b (diff) | |
count receivers in hasTooManyComponents
Receivers should be counted separated. Somehow I initially thought they
were included in the activites count.
BUG: 261874702, 214397059
Test: builds
Change-Id: I12adb57a77020928bee1ee751800f09252e97ff9
| -rw-r--r-- | services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java | 4 |
2 files changed, 5 insertions, 2 deletions
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 2626bb405c42..16f5d1617a8f 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 @@ public interface ParsingPackage { List<ParsedProvider> getProviders(); @NonNull + List<ParsedActivity> getReceivers(); + + @NonNull List<String> getRequestedPermissions(); @Nullable 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 952adda8e238..c6e1793c0ebb 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 @@ 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; } /** |