commit 9a1f2d4b7b31ad7ae1450e12e0564653fa5af22e
author Sooraj Sasindran <sasindran@google.com> Tue Sep 28 21:37:29 2021 +0000
committer Sooraj Sasindran <sasindran@google.com> Fri Oct 08 18:08:22 2021 +0000
tree 68379045648c3e6fad68e30efc05aa0cc296c692
parent c99ace8f0457560d1ad999eaa96eeabb7557cc36

Add packages based upon carrier config rule

Add packages based upon carrier config rule while checking
if it has carrier privilege.

Bug: 185850122
Test: Ran the test mentioned in the bug using https://android-review.googlesource.com/c/platform/cts/+/1680766/
Merged-In: Ib1771296353c4d99cfbe651d3d17405b8278e063
Change-Id: Ib1771296353c4d99cfbe651d3d17405b8278e063

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 03b0be9..6f36f51 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6921,7 +6921,9 @@
                 for (int p = packages.size() - 1; p >= 0; p--) {
                     PackageInfo pkgInfo = packages.get(p);
                     if (pkgInfo != null && pkgInfo.packageName != null
-                            && card.getCarrierPrivilegeStatus(pkgInfo)
+                            && getCarrierPrivilegeStatusFromCarrierConfigRules(
+                                    card.getCarrierPrivilegeStatus(pkgInfo),
+                                    getPhone(phoneId), pkgInfo.packageName)
                             == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
                         privilegedPackages.add(pkgInfo.packageName);
                     }