Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions." am: 7d099030de am: 6270ac2534

Browse Source 
am: f0fd3492b5

Change-Id: I0ba766329f91e28782feadf2c99fb973f188854a
This commit is contained in:
Xiangyu/Malcolm Chen
2019-10-15 11:33:37 -07:00
committed by android-build-merger
parent fe418b9d04 f0fd3492b5
commit 5b4fed76eb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -1204,7 +1204,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
public void notifyCarrierNetworkChange(boolean active) { public void notifyCarrierNetworkChange(boolean active) {
// only CarrierService with carrier privilege rule should have the permission // only CarrierService with carrier privilege rule should have the permission
int[] subIds = Arrays.stream(SubscriptionManager.from(mContext) int[] subIds = Arrays.stream(SubscriptionManager.from(mContext)
.getActiveSubscriptionIdList()) .getActiveSubscriptionIdList(false))
.filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(i)).toArray(); .filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(i)).toArray();
if (ArrayUtils.isEmpty(subIds)) { if (ArrayUtils.isEmpty(subIds)) {
loge("notifyCarrierNetworkChange without carrier privilege"); loge("notifyCarrierNetworkChange without carrier privilege");