| commit | 57f00777b3a83ef60702df511909d7602467ba10 | [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 | 6d855beb433bf879aeab2b025b70e52724cd1b76 | |
| parent | 14ce0a33490a6bf5c3aa24eb92513db303aef092 [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)