commit | 981dccab03b7bc73e5508e042fc7c90900e15c56 | [log] [tgz] |
---|---|---|
author | Chalard Jean <jchalard@google.com> | Thu Feb 06 18:31:19 2020 +0900 |
committer | Cody Kesting <ckesting@google.com> | Mon Mar 30 17:14:33 2020 -0700 |
tree | 5baf2066f380e217f213439a18d984335118790f | |
parent | 4600fa52a6ecc62196be205cc07a1883e956117d [diff] |
Add combine() and equals() for NetworkCapabilities admin UIDs. NetworkCapabilities#mAdministratorUids should be checked for equality when combining NetworkCapabilities. Administrator UIDs should also be included in NetworkCapabilities equals() and hashCode(). Bug: 147903575 Test: FrameworksNetTests Change-Id: I803bdec80e27ee80d3a39844c5fb7aed584ab07d Merged-In: I803bdec80e27ee80d3a39844c5fb7aed584ab07d (cherry picked from commit 5fad8aa761336012bb228afc3b6f7d42fa274242)