From ea7513a9d146906fd0d68d9c4ea5689c770a5641 Mon Sep 17 00:00:00 2001 From: junyulai Date: Sat, 20 Feb 2021 19:11:06 +0800 Subject: [PATCH] [VCN07.7] Add NOT_VCN_MANAGED capability into ConnectivityControllerTest Follow-up from aosp/1549897, the capability will not be in default capabilities, but will be in most of the NetworkRequests which requires internet. Thus, add the capabilities into all test code that simulates capabilities of network by default to provide backward compatibility. Test: atest com.android.server.job.controllers.ConnectivityControllerTest Bug: 179768816 Bug: 175662146 Change-Id: Ifeb8b172d069511756a6f6fcc0444f2ff2b06a96 --- .../server/job/controllers/ConnectivityControllerTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java index 7f86faa4b3936..d4e4caa906a10 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java @@ -19,6 +19,7 @@ package com.android.server.job.controllers; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED; import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; @@ -626,6 +627,7 @@ public class ConnectivityControllerTest { private static NetworkCapabilities createCapabilities() { return new NetworkCapabilities().addCapability(NET_CAPABILITY_INTERNET) + .addCapability(NET_CAPABILITY_NOT_VCN_MANAGED) .addCapability(NET_CAPABILITY_VALIDATED); }