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

Merge "Remove usage of @hide @Deprecated Telephony API in NPMS"

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2020-01-06 19:12:33 +00:00
committed by Android (Google) Code Review
parent 03f00fc5c3 59c78ab2b7
commit 640f5d94b0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -3046,12 +3046,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
// Verify they're not lying about package name
mAppOps.checkPackage(callingUid, callingPackage);
final SubscriptionManager sm;
final SubscriptionInfo si;
final PersistableBundle config;
final long token = Binder.clearCallingIdentity();
try {
si = mContext.getSystemService(SubscriptionManager.class)
.getActiveSubscriptionInfo(subId);
sm = mContext.getSystemService(SubscriptionManager.class);
si = sm.getActiveSubscriptionInfo(subId);
config = mCarrierConfigManager.getConfigForSubId(subId);
} finally {
Binder.restoreCallingIdentity(token);
@@ -3059,7 +3060,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
// First check: is caller the CarrierService?
if (si != null) {
if (si.isEmbedded() && si.canManageSubscription(mContext, callingPackage)) {
if (si.isEmbedded() && sm.canManageSubscription(si, callingPackage)) {
return;
}
}