commit a743688b78909e0d2c4e64ff3f8bd591335fa125
author Rambo Wang <rambowang@google.com> Thu Jan 13 21:51:44 2022 -0800
committer Rambo Wang <rambowang@google.com> Tue Mar 22 13:06:56 2022 -0700
tree e81fd80a323e6eb6518f6699c2076e00ca9cd7af
parent e162e305bb0fcf97a8c07fb32fce551b651a65bc

Support test override carrier privilege in CarrierPrivilegeTracker

Redirect the test override carrier privilege rule to CPT which
will be the unified tracker to handler all carrier privilege check.

The legacy logic that handle test override rule in other components
will be removed once migration is done.

Bug: 214470389
Test: atest
com.google.android.telephony.tests.carrierapp.CarrierAppDeviceTest

Change-Id: Ifa67e5c103a4fb1024f9cf870fd3830783774a6e
Merged-In: Ifa67e5c103a4fb1024f9cf870fd3830783774a6e
(cherry picked from commit 9c9ffdd079652ec5bbde43e115cc5deb227e58f4)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3ff648d..99f1a54 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -149,6 +149,7 @@
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.CallTracker;
+import com.android.internal.telephony.CarrierPrivilegesTracker;
 import com.android.internal.telephony.CarrierResolver;
 import com.android.internal.telephony.CellNetworkScanResult;
 import com.android.internal.telephony.CommandException;
@@ -9061,6 +9062,11 @@
                 loge("setCarrierTestOverride fails with invalid subId: " + subId);
                 return;
             }
+            CarrierPrivilegesTracker cpt = phone.getCarrierPrivilegesTracker();
+            if (cpt != null) {
+                cpt.setTestOverrideCarrierPrivilegeRules(carrierPrivilegeRules);
+            }
+            // TODO(b/211796398): remove the legacy logic below once CPT migration is done.
             phone.setCarrierTestOverride(mccmnc, imsi, iccid, gid1, gid2, plmn, spn,
                     carrierPrivilegeRules, apn);
             if (carrierPrivilegeRules == null) {