commit e1601cf66f7ed56cc7ae25784d58f64f242f850b
author Chiachang Wang <chiachangwang@google.com> Tue Apr 13 11:54:57 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 13 11:54:57 2021 +0000
tree 4b68492f898cee9d220abcfcfaa470e7334ebe2d
parent 0a250d57b5517be8e0ad7b0852473f3a610a5601
parent 80a70a36791f768e939f2591705f8d831c2c27b6

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

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

Change-Id: I59dcbafe7b0f0f9b6d87e69d2e6f3e2276a69ce3

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

diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
index c0600e7..29efb74 100755
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
@@ -722,7 +722,8 @@
         final TestableNetworkCallback otherUidCallback = new TestableNetworkCallback();
         final TestableNetworkCallback myUidCallback = new TestableNetworkCallback();
         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());
             runWithShellPermissionIdentity(() -> {
                 mCM.registerSystemDefaultNetworkCallback(systemDefaultCallback, h);