diff options
| author | 2022-12-20 10:15:35 +0000 | |
|---|---|---|
| committer | 2022-12-20 10:15:35 +0000 | |
| commit | 888c4e9a35a8d2962a41ab6c3847a049eae5ad64 (patch) | |
| tree | 6b97ca3937f31363562e333f884b2a6b82ef41a1 | |
| parent | 1f5abee8999dba86d1593b37b08cf74c77497b92 (diff) | |
| parent | 8457db6cf317a376fd3b725f615cd460fc1f7648 (diff) | |
Merge "count receivers in hasTooManyComponents"
| -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; } /** |