summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStoreMaintenance.java
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2021-03-10 00:18:59 +0900
committerLorenzo Colitti <lorenzo@google.com>2021-03-11 00:59:14 +0900
commit8a7bb857ac5870903adda22d1d61cad10e605610 (patch)
treec9edbb1563db1d8a1331ee6c55498729f24e3214 /keystore/java/android/security/AndroidKeyStoreMaintenance.java
parente93309bff78b8098bb16a9a2c60a070e4f8dfd22 (diff)
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
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStoreMaintenance.java')
0 files changed, 0 insertions, 0 deletions