commit 9669abbeff384d3fe1d9a28f194ad00669302642
author Remi NGUYEN VAN <reminv@google.com> Thu Apr 26 17:52:03 2018 +0900
committer Remi NGUYEN VAN <reminv@google.com> Wed May 23 13:19:57 2018 +0900
tree f70fe961ca1cc059f2ef84b7625525baebbc9c63
parent 3a3785d20252fb0f99e39fc34c995a97a8da36cb

Fix testRegisterUsageCallback failure in setUp

LocalServices.addService in NetworkStatsService is currently failing
with IllegalStateException "Overriding service registration". Setting up
LocalServices in the test to avoid this issue might be possible, but
moving the registration to the only non-test caller of that constructor
as done here solves the issue and avoids side-effects from a constructor.

Test: this test passes in master through runtest frameworks-net
Bug: b/78487385
Bug: b/80082746
Change-Id: I884a7a8bd7db3fcd220b785ba9914ac8c77720f0