Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

9eb76885

Commit 9eb76885 authored 3 years ago by Les Lee Committed by Gerrit Code Review 3 years ago

Downloads
- Plain Diff

Merge "carrier data usage: Use carrier template as default policy"

parents ec33ff5b 95904d43

No related branches found

No related tags found

No related merge requests found

Changes 5

Expand all Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/net/NetworkTemplate.java 4 additions, 0 deletions

core/java/android/net/NetworkTemplate.java
services/core/java/com/android/server/net/NetworkPolicyManagerService.java 81 additions, 41 deletions

...a/com/android/server/net/NetworkPolicyManagerService.java
services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/netpolicy/network-policy-mobile.xml 6 additions, 0 deletions

...icyManagerServiceTest/netpolicy/network-policy-mobile.xml
services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/netpolicy/network-policy-wifi-with-subscriberId-match-rule-all-and-templateMetered-no.xml 5 additions, 0 deletions

...th-subscriberId-match-rule-all-and-templateMetered-no.xml
services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java 67 additions, 29 deletions

...m/android/server/net/NetworkPolicyManagerServiceTest.java

with 163 additions and 70 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment