diff options
| author | 2024-06-07 22:04:43 +0000 | |
|---|---|---|
| committer | 2024-06-07 22:04:43 +0000 | |
| commit | 55fc7d7eefdb3dd1746ecacdb3ccbd06f67d2460 (patch) | |
| tree | 68df28e81432e09a239ffa75c8c9207edaafd74a | |
| parent | 78670d45ec00e23b83fca3c2b76a1149702f67cb (diff) | |
| parent | 6ed23fc1c4e71bde803aaee698cfa4f736ab14aa (diff) | |
Merge "Fix NPE for null plans" into main
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkPolicyManagerService.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/net/OWNERS | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index c60ac3a74ebd..f03c639c103c 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -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"); } diff --git a/services/core/java/com/android/server/net/OWNERS b/services/core/java/com/android/server/net/OWNERS index 669cdaaf3ab5..bbc7c013f170 100644 --- a/services/core/java/com/android/server/net/OWNERS +++ b/services/core/java/com/android/server/net/OWNERS @@ -1,5 +1,6 @@ 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 |