diff options
Diffstat (limited to 'tests')
5 files changed, 2 insertions, 5 deletions
diff --git a/tests/JobSchedulerPerfTests/OWNERS b/tests/JobSchedulerPerfTests/OWNERS index 6f207fb1a00e..c8345f71b39a 100644 --- a/tests/JobSchedulerPerfTests/OWNERS +++ b/tests/JobSchedulerPerfTests/OWNERS @@ -1 +1 @@ -include /apex/jobscheduler/OWNERS +include /apex/jobscheduler/JOB_OWNERS diff --git a/tests/JobSchedulerTestApp/OWNERS b/tests/JobSchedulerTestApp/OWNERS index 6f207fb1a00e..c8345f71b39a 100644 --- a/tests/JobSchedulerTestApp/OWNERS +++ b/tests/JobSchedulerTestApp/OWNERS @@ -1 +1 @@ -include /apex/jobscheduler/OWNERS +include /apex/jobscheduler/JOB_OWNERS diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java index e29e4621d571..e045f100e549 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionTestBase.java @@ -224,7 +224,6 @@ public class VcnGatewayConnectionTestBase { doReturn(mFeatureFlags).when(mVcnContext).getFeatureFlags(); doReturn(true).when(mVcnContext).isFlagSafeModeTimeoutConfigEnabled(); doReturn(true).when(mVcnContext).isFlagIpSecTransformStateEnabled(); - doReturn(true).when(mVcnContext).isFlagNetworkMetricMonitorEnabled(); doReturn(mUnderlyingNetworkController) .when(mDeps) diff --git a/tests/vcn/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java b/tests/vcn/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java index 421e1ad20b78..bc7ff47d9a01 100644 --- a/tests/vcn/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java +++ b/tests/vcn/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java @@ -127,7 +127,6 @@ public abstract class NetworkEvaluationTestBase { false /* isInTestMode */)); doNothing().when(mVcnContext).ensureRunningOnLooperThread(); - doReturn(true).when(mVcnContext).isFlagNetworkMetricMonitorEnabled(); doReturn(true).when(mVcnContext).isFlagIpSecTransformStateEnabled(); setupSystemService( diff --git a/tests/vcn/java/com/android/server/vcn/routeselection/UnderlyingNetworkControllerTest.java b/tests/vcn/java/com/android/server/vcn/routeselection/UnderlyingNetworkControllerTest.java index 588624b56221..6f31d8db070f 100644 --- a/tests/vcn/java/com/android/server/vcn/routeselection/UnderlyingNetworkControllerTest.java +++ b/tests/vcn/java/com/android/server/vcn/routeselection/UnderlyingNetworkControllerTest.java @@ -226,7 +226,6 @@ public class UnderlyingNetworkControllerTest { private void resetVcnContext(VcnContext vcnContext) { reset(vcnContext); doNothing().when(vcnContext).ensureRunningOnLooperThread(); - doReturn(true).when(vcnContext).isFlagNetworkMetricMonitorEnabled(); doReturn(true).when(vcnContext).isFlagIpSecTransformStateEnabled(); } |