tree 0a86f6168d8c5dd33c27909270eb5497f9f29cf0
parent cda101be7d997a796b1839b36d687c9c726b0767
author Lorenzo Colitti <lorenzo@google.com> 1606752517 +0900
committer Lorenzo Colitti <lorenzo@google.com> 1606837557 +0900

Refactor applyUnderlyingCapabilities and its test.

This reduces verbose assertions and makes the test more compact.
I'm not sure whether it's actually more valuable, since the
current code, while more verbose, is probably more
straightforward to understand.

Also add a test for passing in a null underlying network (i.e.,
follow default network). This requires a minor refactoring in
ConnectivityService because the applyUnderlyingCapabilities does
not currently treat null specially.

Bug: 173331190
Test: test-only change
Change-Id: Ic5a3e16969ea9e1a529706850f148cb0d5fd8e09