From 85cbe604df7d1be95bf74ba47dfa544fab2da725 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Thu, 7 Dec 2023 01:11:04 +0900 Subject: [PATCH] Update testAllowedUids to follow revert of canSeeAllowedUids aosp/2854709 reverted canSeeAllowedUids change done by aosp/2405720. But aosp/2854709 did not update testAllowedUids and broke testAllowedUids since cts can no longer see allowedUids. This CL updates testAllowedUids to skip some test cases. Followup CLs will allow ownerUid to see allowedUids again and re-enable test cases. Bug: 315112049 Test: TH Change-Id: I1e4ca09ad15b6150182325cbfda1548e5fec79d1 --- tests/cts/net/src/android/net/cts/NetworkAgentTest.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt index c7d65555e3..fe2f813882 100644 --- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt +++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt @@ -774,11 +774,13 @@ class NetworkAgentTest { // Cell and WiFi are allowed to set UIDs, but not Bluetooth or agents with multiple // transports. - doTestAllowedUids(defaultSubId, TRANSPORT_CELLULAR, uid, expectUidsPresent = true) + // TODO(b/315136340): Allow ownerUid to see allowedUids and enable below test case + // doTestAllowedUids(defaultSubId, TRANSPORT_CELLULAR, uid, expectUidsPresent = true) if (SdkLevel.isAtLeastV()) { // Cannot be tested before V because WifiInfo.Builder#setSubscriptionId doesn't // exist - doTestAllowedUids(defaultSubId, TRANSPORT_WIFI, uid, expectUidsPresent = true) + // TODO(b/315136340): Allow ownerUid to see allowedUids and enable below test case + // doTestAllowedUids(defaultSubId, TRANSPORT_WIFI, uid, expectUidsPresent = true) } doTestAllowedUids(defaultSubId, TRANSPORT_BLUETOOTH, uid, expectUidsPresent = false) doTestAllowedUids(defaultSubId, intArrayOf(TRANSPORT_CELLULAR, TRANSPORT_WIFI), uid,