commit eaba88af8e6393be65db8ed374c956d7fdf5f46d
author chen xu <fionaxu@google.com> Fri Mar 15 13:15:10 2019 -0700
committer chen xu <fionaxu@google.com> Fri Mar 15 13:15:10 2019 -0700
tree 6fb1d39248a7cff1cd68ce806d2cfd7b3e29ab50
parent 50a266705d7452bf3ba5215feadf56020b3cd8fc

support mock carrier privilege rules and apn

Bug: 128441910
Test: atest GtsGmscoreHostTestCases:com.google.android.gts.telephony.TelephonyHostTest
Change-Id: I099e2d002d2ae85476c656db759183ae84d5f70b

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 67bfa23..797a5bd 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6291,7 +6291,7 @@
 
     @Override
     public void setCarrierTestOverride(int subId, String mccmnc, String imsi, String iccid, String
-            gid1, String gid2, String plmn, String spn) {
+            gid1, String gid2, String plmn, String spn, String carrierPrivilegeRules, String apn) {
         enforceModifyPermission();
 
         final long identity = Binder.clearCallingIdentity();
@@ -6301,7 +6301,8 @@
                 loge("setCarrierTestOverride fails with invalid subId: " + subId);
                 return;
             }
-            phone.setCarrierTestOverride(mccmnc, imsi, iccid, gid1, gid2, plmn, spn);
+            phone.setCarrierTestOverride(mccmnc, imsi, iccid, gid1, gid2, plmn, spn,
+                    carrierPrivilegeRules, apn);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }