Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

ef43bcbe

Commit ef43bcbe authored 1 year ago by Yan Yan Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "Respect caller config to disable VCN safe mode" into main am: ace49e05

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802927

Change-Id: I43b60c5895a6b66ddbd3e17d483aa5b8a0bf4ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 3e1fe2ba ace49e05

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/vcn/VcnContext.java 11 additions, 0 deletions

services/core/java/com/android/server/vcn/VcnContext.java
services/core/java/com/android/server/vcn/VcnGatewayConnection.java 8 additions, 0 deletions

...ore/java/com/android/server/vcn/VcnGatewayConnection.java
tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java 10 additions, 0 deletions

.../java/android/net/vcn/VcnGatewayConnectionConfigTest.java
tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java 71 additions, 0 deletions

...id/server/vcn/VcnGatewayConnectionConnectedStateTest.java
tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java 12 additions, 1 deletion

.../com/android/server/vcn/VcnGatewayConnectionTestBase.java

with 112 additions and 1 deletion

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