919385b549e1a2dfe7f5d482cd875c6401088097 - platform/frameworks/base

commit	919385b549e1a2dfe7f5d482cd875c6401088097	[log] [tgz]
author	Cody Kesting <ckesting@google.com>	Wed Mar 18 15:22:12 2020 -0700
committer	Cody Kesting <ckesting@google.com>	Mon Mar 30 17:13:37 2020 -0700
tree	f8452caffbbe171bb32088b13ade755356d931f8
parent	da502403439785a7647a5a9630804c4d1b41579a [diff]

Clean up handling of NetworkCapabilities#administratorUids.

Update ConnectivityService's check for administrator UIDs to use
ArrayUtils to check for UID inclusion. Update the NetworkCapabilities
annotation on the administrator UIDs field to clarify that it is
NonNull.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: Id630fe9d76aacdaf038fdaa5360f0327520ee0c3
Merged-In: Id630fe9d76aacdaf038fdaa5360f0327520ee0c3
(cherry picked from commit 898496365aa1f3601cdbb305004ad0de11ff6bfc)

core/java/android/net/NetworkCapabilities.java[diff]
services/core/java/com/android/server/ConnectivityService.java[diff]

2 files changed