commit 9f8c9f4716c74a79a173ca701cae435ef648f7a3
author Rambo Wang <rambowang@google.com> Tue Mar 22 23:21:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 22 23:21:30 2022 +0000
tree e81fd80a323e6eb6518f6699c2076e00ca9cd7af
parent 7bac9cf2757a27a2a17e6f074eba02d2d6edb2f1
parent a743688b78909e0d2c4e64ff3f8bd591335fa125

Merge "Support test override carrier privilege in CarrierPrivilegeTracker"

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) {