Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ed23fc1 authored by Sarah Kim's avatar Sarah Kim
Browse files

Fix NPE for null plans 

Test: build, atest NetworkPolicyManagerServiceTest
Bug: 327985127
Change-Id: I5df9986d9159efb586f7e19def75c1beceb8f31f
parent f8e96bdd

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -3965,8 +3965,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        // allow override without having plans defined.

        synchronized (mNetworkPoliciesSecondLock) {

            final SubscriptionPlan plan = getPrimarySubscriptionPlanLocked(subId);

            if (overrideMask != SUBSCRIPTION_OVERRIDE_UNMETERED && plan == null

                    || plan.getDataLimitBehavior() == SubscriptionPlan.LIMIT_BEHAVIOR_UNKNOWN) {

            if (overrideMask != SUBSCRIPTION_OVERRIDE_UNMETERED && (plan == null

                    || plan.getDataLimitBehavior() == SubscriptionPlan.LIMIT_BEHAVIOR_UNKNOWN)) {

                throw new IllegalStateException(

                        "Must provide valid SubscriptionPlan to enable overriding");

            }

services/core/java/com/android/server/net/OWNERS

+1 −0
Original line number Diff line number Diff line 
set noparent

file:platform/packages/modules/Connectivity:main:/OWNERS_core_networking

per-file NetworkPolicyManagerService.java=jackyu@google.com, sarahchin@google.com



jsharkey@android.com

sudheersai@google.com