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

9a5b7175

Commit 9a5b7175 authored 4 years ago by Cody Kesting Committed by Gerrit Code Review 4 years ago

Downloads
- Plain Diff

Merge changes I128a894c,I3336c150

* changes:
  Remove use of locks in VcnGatewayConnection.
  Support Safemode for VCNs.

parents e4d468f1 da86336b

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

services/core/java/com/android/server/VcnManagementService.java 40 additions, 6 deletions

...es/core/java/com/android/server/VcnManagementService.java
services/core/java/com/android/server/vcn/Vcn.java 76 additions, 9 deletions

services/core/java/com/android/server/vcn/Vcn.java
services/core/java/com/android/server/vcn/VcnGatewayConnection.java 18 additions, 15 deletions

...ore/java/com/android/server/vcn/VcnGatewayConnection.java
tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java 6 additions, 1 deletion

.../java/android/net/vcn/VcnGatewayConnectionConfigTest.java
tests/vcn/java/com/android/server/VcnManagementServiceTest.java 29 additions, 3 deletions

...vcn/java/com/android/server/VcnManagementServiceTest.java
tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionDisconnectedStateTest.java 6 additions, 1 deletion

...server/vcn/VcnGatewayConnectionDisconnectedStateTest.java
tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java 9 additions, 1 deletion

.../com/android/server/vcn/VcnGatewayConnectionTestBase.java
tests/vcn/java/com/android/server/vcn/VcnTest.java 72 additions, 18 deletions

tests/vcn/java/com/android/server/vcn/VcnTest.java

with 256 additions and 54 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