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

e4f56a7e

Commit e4f56a7e authored 7 years ago by Treehugger Robot Committed by Gerrit Code Review 7 years ago

Downloads
- Plain Diff

Merge "Use Vpn rules (not firewall) for always-on VPN"

parents c8d5f84f c3736bc1

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

services/core/java/com/android/server/ConnectivityService.java 3 additions, 11 deletions

...ces/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/NetworkManagementService.java 1 addition, 2 deletions

...ore/java/com/android/server/NetworkManagementService.java
services/core/java/com/android/server/connectivity/Vpn.java 47 additions, 15 deletions

services/core/java/com/android/server/connectivity/Vpn.java
services/core/java/com/android/server/net/LockdownVpnTracker.java 2 additions, 65 deletions

.../core/java/com/android/server/net/LockdownVpnTracker.java
tests/net/java/com/android/server/connectivity/VpnTest.java 57 additions, 0 deletions

tests/net/java/com/android/server/connectivity/VpnTest.java

with 110 additions and 93 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