Merge "Add list of Administrator UIDs to NetworkCapabilities." am: 452ccae317 am: 347f56c836 am: f11b5198ad

Change-Id: Idcd07e357703f7ae3f2c09de33b80b328e6bd384
2020-01-24 08:06:14 +00:00
parent b00a05654c f11b5198ad
commit a223fbd6be
3 changed files with 66 additions and 1 deletions
--- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
@@ -271,7 +271,7 @@ public class NetworkCapabilitiesTest {
            .addCapability(NET_CAPABILITY_NOT_METERED);
        assertParcelingIsLossless(netCap);
        netCap.setSSID(TEST_SSID);
-        assertParcelSane(netCap, 12);
+        assertParcelSane(netCap, 13);
    }

    @Test