From f2b0b41764fa8e536637b37176471c9cd683ca38 Mon Sep 17 00:00:00 2001
From: Chiachang Wang <chiachangwang@google.com>
Date: Mon, 22 Mar 2021 06:15:02 +0000
Subject: [PATCH] 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 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
index 81f668f7b0..a7ad695641 100644
--- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
@@ -328,8 +328,7 @@ public class NetworkCapabilitiesTest {
         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});
         }