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

5621969f

Commit 5621969f authored 1 year ago by Yan Yan Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "Support adjustable VCN safe mode timeout" into main am: c3cf4375 am:...

Merge "Support adjustable VCN safe mode timeout" into main am: c3cf4375 am: 1f093250 am: 5ee50f36

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

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

parents e381fddb 5ee50f36

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/net/vcn/VcnManager.java 15 additions, 0 deletions

core/java/android/net/vcn/VcnManager.java
core/java/android/net/vcn/flags.aconfig 7 additions, 0 deletions

core/java/android/net/vcn/flags.aconfig
services/core/java/com/android/server/vcn/VcnContext.java 4 additions, 0 deletions

services/core/java/com/android/server/vcn/VcnContext.java
services/core/java/com/android/server/vcn/VcnGatewayConnection.java 22 additions, 3 deletions

...ore/java/com/android/server/vcn/VcnGatewayConnection.java
tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTest.java 72 additions, 0 deletions

...java/com/android/server/vcn/VcnGatewayConnectionTest.java
tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java 1 addition, 0 deletions

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

with 121 additions and 3 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