commit a8e9090cf65b982a9c6d12154e861375922163b6
author Remi NGUYEN VAN <reminv@google.com> Thu Apr 26 17:52:03 2018 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue Aug 14 18:14:09 2018 +0900
tree cb4f9928e041e95f7c9f041bf903dea71cf1c3c5
parent bf668472406a4b7f030eb20f35e4e4386b56671f

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: atest FrameworksNetTests does not choke on this test
Bug: b/78487385
Bug: b/80082746
Change-Id: I5dba98fc79aec0800c8b71e6c7e23d1cfbcae852
Merged-In: I884a7a8bd7db3fcd220b785ba9914ac8c77720f0
(Clean cherry-pick of go/ag/4061255)