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

39338def

Commit 39338def authored 4 years ago by Treehugger Robot Committed by Gerrit Code Review 4 years ago

Downloads
- Plain Diff

Merge "[Mainline] Core Platform APIs migration"

parents 07f94fbb 41ccd6a3

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 1 addition, 1 deletion

...ces/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/TestNetworkService.java 5 additions, 2 deletions

...ices/core/java/com/android/server/TestNetworkService.java
services/core/java/com/android/server/connectivity/DnsManager.java 2 additions, 1 deletion

...core/java/com/android/server/connectivity/DnsManager.java
services/core/java/com/android/server/connectivity/Nat464Xlat.java 2 additions, 2 deletions

...core/java/com/android/server/connectivity/Nat464Xlat.java
services/core/java/com/android/server/connectivity/Vpn.java 8 additions, 4 deletions

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

with 18 additions and 10 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