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
This commit is contained in:
Motomu Utsumi 2023-12-07 01:11:04 +09:00
commit 85cbe604df

View file

@ -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,