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

ec1966e3

Commit ec1966e3 authored 4 years ago by Chalard Jean Committed by Gerrit Code Review 4 years ago

Downloads
- Plain Diff

Merge changes I623e2983,I8b95e020

* changes:
  Fix comments from aosp/1455975
  Manage VPN legacy state separately from NetworkInfo

parents 39c6068c e7f602e3

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

core/java/com/android/internal/net/LegacyVpnInfo.java 3 additions, 4 deletions

core/java/com/android/internal/net/LegacyVpnInfo.java
services/core/java/com/android/server/connectivity/Vpn.java 5 additions, 1 deletion

services/core/java/com/android/server/connectivity/Vpn.java

with 8 additions and 5 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