commit d7b5bdc88450976ffddc088cd25d207bad9146bd
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 18 20:55:49 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 18 20:55:49 2021 +0000
tree 2ebf6be89e5ea7946ac0b57feb6777a747fac401
parent a6d236b3115b01aad0c7244cab010fb83fa6c7c7
parent 9a1f2d4b7b31ad7ae1450e12e0564653fa5af22e

Merge "Add packages based upon carrier config rule" into sc-v2-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 78b6bbf..fcb1764 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6922,7 +6922,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);
                     }