commit f2b0b41764fa8e536637b37176471c9cd683ca38
author Chiachang Wang <chiachangwang@google.com> Mon Mar 22 06:15:02 2021 +0000
committer Chiachang Wang <chiachangwang@google.com> Mon Mar 22 06:15:02 2021 +0000
tree 1943cc89faa572fef52745f9e410aabdfc5576bb
parent 628ada1d2d631ddaec494bdfffe86ab2d03da773

Revert "Correct the logic in NetworkCapabilitiesTest"

This reverts commit 628ada1d2d631ddaec494bdfffe86ab2d03da773.

Reason for revert: <Merge abnormal in automerger>

Change-Id: I0cdb401f4962050bf24dc9d9871d4ef15cf52629

tests/net/common/java/android/net/NetworkCapabilitiesTest.java

diff --git a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
index 81f668f..a7ad695 100644
--- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
@@ -328,8 +328,7 @@
         if (isAtLeastS()) {
             netCap.setSubIds(Set.of(TEST_SUBID1, TEST_SUBID2));
             netCap.setUids(uids);
-        }
-        if (isAtLeastR()) {
+        } else if (isAtLeastR()) {
             netCap.setOwnerUid(123);
             netCap.setAdministratorUids(new int[] {5, 11});
         }