Replace the usage of UidRange
UidRange is used in a shared way between ConnectivityService and VPN through the use of NetworkCapabilities. UidRange will be part of the ConnectivityService mainline but Vpn.java will stay in the framework. We need a way to replace the APIs using UidRange, or to make UidRange system API. The only really relevant surface here is NetworkCapabilities#{setUids, getUids}. The need for UidRange could be replaced by an integer Range, so replace the usage of UidRange by a integer Range in NetworkCapabilities#{setUids, getUids} and update the relevant callers. Bug: 172183305 Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk Change-Id: I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9
Showing
- framework/src/android/net/NetworkCapabilities.java 19 additions, 12 deletionsframework/src/android/net/NetworkCapabilities.java
- framework/src/android/net/NetworkRequest.java 3 additions, 2 deletionsframework/src/android/net/NetworkRequest.java
- framework/src/android/net/UidRange.java 31 additions, 0 deletionsframework/src/android/net/UidRange.java
- services/core/java/com/android/server/ConnectivityService.java 10 additions, 12 deletions...ces/core/java/com/android/server/ConnectivityService.java
- tests/net/common/java/android/net/NetworkCapabilitiesTest.java 101 additions, 72 deletions.../net/common/java/android/net/NetworkCapabilitiesTest.java
- tests/net/integration/util/com/android/server/NetworkAgentWrapper.java 2 additions, 2 deletions...egration/util/com/android/server/NetworkAgentWrapper.java
- tests/net/java/com/android/server/ConnectivityServiceTest.java 33 additions, 27 deletions.../net/java/com/android/server/ConnectivityServiceTest.java
- tests/net/java/com/android/server/connectivity/VpnTest.java 75 additions, 58 deletionstests/net/java/com/android/server/connectivity/VpnTest.java
Loading
Please register or sign in to comment