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

Commit 55fc7d7e authored by Sarah Kim's avatar Sarah Kim Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE for null plans" into main

parents 78670d45 6ed23fc1

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