diff options
| author | 2020-03-18 19:40:39 +0000 | |
|---|---|---|
| committer | 2020-03-18 19:40:39 +0000 | |
| commit | 8bb60d66e3cabaf05948dfdb7730f592d1293a2f (patch) | |
| tree | a62b59216a49ac6b86a9d22307fab98170c7122f | |
| parent | 54dc01f3b85fb268f50f7da4b7184c5eff65a713 (diff) | |
| parent | 5983c9a1427223e6f53b6a3f689dc8e2d83f1dfc (diff) | |
Merge "Update NetworkCapabilities administrator UIDs to be int[]." into rvc-dev
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 2 | ||||
| -rw-r--r-- | service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index 5da041f8b7..f5f96a1345 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -4348,7 +4348,7 @@ public class ClientModeImpl extends StateMachine { } result.setOwnerUid(currentWifiConfiguration.creatorUid); - result.setAdministratorUids(Arrays.asList(currentWifiConfiguration.creatorUid)); + result.setAdministratorUids(new int[] {currentWifiConfiguration.creatorUid}); if (!WifiConfiguration.isMetered(currentWifiConfiguration, mWifiInfo)) { result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); diff --git a/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index 2eae8ca548..7e12c26991 100644 --- a/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -21,6 +21,7 @@ import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.DISABLED import static com.android.server.wifi.ClientModeImpl.CMD_PRE_DHCP_ACTION; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; @@ -3558,8 +3559,8 @@ public class ClientModeImplTest extends WifiBaseTest { assertNull(networkCapabilities.getNetworkSpecifier()); assertEquals(mConnectedNetwork.creatorUid, networkCapabilities.getOwnerUid()); - assertEquals( - Arrays.asList(mConnectedNetwork.creatorUid), + assertArrayEquals( + new int[] {mConnectedNetwork.creatorUid}, networkCapabilities.getAdministratorUids()); // Should set bandwidth correctly |