commit e30db8d2a78de389bb40f689fb5d4c7b35f920ee
author Lorenzo Colitti <lorenzo@google.com> Wed Mar 10 00:18:59 2021 +0900
committer Lorenzo Colitti <lorenzo@google.com> Thu Mar 11 00:59:14 2021 +0900
tree 3c9e5d35e112edfa35bf09f8bc1cac51f30db8cb
parent 8affa9ee66a791b5cfbf757875062fe97f183cce

Unbreak extraInfo values returned to apps.

These were broken by aosp/1553463, which made filterNetworkInfo
unconditionally call setDetailedState with a reason of "" and an
extraInfo of null.

Fix both synchronous getter APIs (e.g., getNetworkInfo) and
CONNECTIVITY_ACTION broadcasts by calling a new
filterForLegacyLockdown method that behaves similarly to how the
now-deleted LockdownVpnTracker#augmentNetworkInfo used to behave.

While I'm at it, move back to private a method that was public
only because LockdownVpnTracker used it.

Fix: 181855958
Test: new unit test coverage
Change-Id: I2c7b88fcec9dd36b45cb51db8d19b3ee8bad44a6