diff options
| author | David Su <dysu@google.com> | 2019-05-21 12:27:27 -0700 |
|---|---|---|
| committer | David Su <dysu@google.com> | 2019-05-21 22:02:08 +0000 |
| commit | 2e7b60ac0d7e6f45eaa4b2ee4d164dc6b718a22c (patch) | |
| tree | 25f88b1986cd7e3987613d0634a3adfd9a4e1b4a /service | |
| parent | 7d44d68570537a387c6e0efdcb1ebe28a8367fbb (diff) | |
Wifi Multi-SIM: Check is Carrier App for any SIM slot
Old behavior only checks if the carrier app corresponds
to the default SIM slot. Fixed so that an app is a
carrier app if it matches the SIM card in any slot.
Bug: 133201501
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ic6a6340c287db423d5326a42741bc17672092069
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index b18ec003c..ef57382bf 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -1817,9 +1817,9 @@ public class WifiServiceImpl extends BaseWifiService { } boolean isTargetSdkLessThanQOrPrivileged = isTargetSdkLessThanQOrPrivileged( packageName, Binder.getCallingPid(), callingUid); - boolean isCarrierApp = - mWifiInjector.makeTelephonyManager().checkCarrierPrivilegesForPackage(packageName) - == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS; + boolean isCarrierApp = mWifiInjector.makeTelephonyManager() + .checkCarrierPrivilegesForPackageAnyPhone(packageName) + == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS; if (!isTargetSdkLessThanQOrPrivileged && !isCarrierApp) { mLog.info("getConfiguredNetworks not allowed for uid=%") .c(callingUid).flush(); |