LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update the method based on API feedback" am: 0a5d964242 am: 80a70a3679

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671535

Change-Id: I13071221d470bd633ef8337889b803a388bcab05
This commit is contained in:
Chiachang Wang
2021-04-13 11:54:13 +00:00
committed by Automerger Merge Worker
parent ffc11490ca 80a70a3679
commit 807d7f2e41
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
View File

@@ -722,7 +722,8 @@ public class VpnTest extends InstrumentationTestCase {
final TestableNetworkCallback otherUidCallback = new TestableNetworkCallback(); final TestableNetworkCallback otherUidCallback = new TestableNetworkCallback();
final TestableNetworkCallback myUidCallback = new TestableNetworkCallback(); final TestableNetworkCallback myUidCallback = new TestableNetworkCallback();
if (SdkLevel.isAtLeastS()) { if (SdkLevel.isAtLeastS()) {
final int otherUid = UserHandle.getUid(UserHandle.of(5), Process.FIRST_APPLICATION_UID); final int otherUid =
UserHandle.of(5 /* userId */).getUid(Process.FIRST_APPLICATION_UID);
final Handler h = new Handler(Looper.getMainLooper()); final Handler h = new Handler(Looper.getMainLooper());
runWithShellPermissionIdentity(() -> { runWithShellPermissionIdentity(() -> {
mCM.registerSystemDefaultNetworkCallback(systemDefaultCallback, h); mCM.registerSystemDefaultNetworkCallback(systemDefaultCallback, h);