From 8457db6cf317a376fd3b725f615cd460fc1f7648 Mon Sep 17 00:00:00 2001
From: Songchun Fan <schfan@google.com>
Date: Sun, 18 Dec 2022 21:27:43 -0800
Subject: [PATCH] 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
---
 .../com/android/server/pm/pkg/parsing/ParsingPackage.java     | 3 +++
 .../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 2626bb405c425..16f5d1617a8f4 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
@@ -451,6 +451,9 @@ public interface ParsingPackage {
     @NonNull
     List<ParsedProvider> getProviders();
 
+    @NonNull
+    List<ParsedActivity> getReceivers();
+
     @NonNull
     List<String> getRequestedPermissions();
 
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 952adda8e2380..c6e1793c0ebb3 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;
     }
 
     /**