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

Merge "fix: Invalid subscription plan cause NPE" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-02 15:03:49 +00:00
committed by Android (Google) Code Review
parent c45c93b894 738f4416cf
commit d0e38d0a25
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2159,6 +2159,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
if (!quotaEnabled) continue; if (!quotaEnabled) continue;
if (snapshot.getNetwork() == null) continue; if (snapshot.getNetwork() == null) continue;
final int subId = getSubIdLocked(snapshot.getNetwork()); final int subId = getSubIdLocked(snapshot.getNetwork());
if (subId == INVALID_SUBSCRIPTION_ID) continue;
final SubscriptionPlan plan = getPrimarySubscriptionPlanLocked(subId); final SubscriptionPlan plan = getPrimarySubscriptionPlanLocked(subId);
if (plan == null) continue; if (plan == null) continue;
@@ -2181,9 +2182,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
final long startOfDay = ZonedDateTime.ofInstant(now, cycle.getLower().getZone()) final long startOfDay = ZonedDateTime.ofInstant(now, cycle.getLower().getZone())
.truncatedTo(ChronoUnit.DAYS) .truncatedTo(ChronoUnit.DAYS)
.toInstant().toEpochMilli(); .toInstant().toEpochMilli();
final long totalBytes = getTotalBytes( final String subscriberId = snapshot.getSubscriberId();
buildTemplateCarrierMetered(snapshot.getSubscriberId()), final long totalBytes = subscriberId == null
start, startOfDay); ? 0 : getTotalBytes(
buildTemplateCarrierMetered(subscriberId), start, startOfDay);
final long remainingBytes = limitBytes - totalBytes; final long remainingBytes = limitBytes - totalBytes;
// Number of remaining days including current day // Number of remaining days including current day
final long remainingDays = final long remainingDays =
@@ -2706,6 +2708,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
// write all known subscription plans // write all known subscription plans
for (int i = 0; i < mSubscriptionPlans.size(); i++) { for (int i = 0; i < mSubscriptionPlans.size(); i++) {
final int subId = mSubscriptionPlans.keyAt(i); final int subId = mSubscriptionPlans.keyAt(i);
if (subId == INVALID_SUBSCRIPTION_ID) continue;
final String ownerPackage = mSubscriptionPlansOwner.get(subId); final String ownerPackage = mSubscriptionPlansOwner.get(subId);
final SubscriptionPlan[] plans = mSubscriptionPlans.valueAt(i); final SubscriptionPlan[] plans = mSubscriptionPlans.valueAt(i);
if (ArrayUtils.isEmpty(plans)) continue; if (ArrayUtils.isEmpty(plans)) continue;
@@ -5619,7 +5622,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
// Turn carrier/mobile data limit off // Turn carrier/mobile data limit off
NetworkPolicy[] policies = getNetworkPolicies(mContext.getOpPackageName()); NetworkPolicy[] policies = getNetworkPolicies(mContext.getOpPackageName());
NetworkTemplate templateCarrier = buildTemplateCarrierMetered(subscriber); NetworkTemplate templateCarrier = subscriber != null
? buildTemplateCarrierMetered(subscriber) : null;
NetworkTemplate templateMobile = buildTemplateMobileAll(subscriber); NetworkTemplate templateMobile = buildTemplateMobileAll(subscriber);
for (NetworkPolicy policy : policies) { for (NetworkPolicy policy : policies) {
// All policies loaded from disk will be carrier templates, and setting will also only // All policies loaded from disk will be carrier templates, and setting will also only