OSDN Git Service

Implement CACert queries in SecurityController
authorphweiss <phweiss@google.com>
Wed, 19 Apr 2017 18:15:06 +0000 (20:15 +0200)
committerphweiss <phweiss@google.com>
Tue, 9 May 2017 13:35:30 +0000 (15:35 +0200)
commit7eeab2cdd99f84ecef12ebbb92e0731b26508da1
tree07400ff228dba5e9cb51c6d9cf0bcb66bcd91f85
parent7cf5f74f3fda19901d8c572f8c47981eda96e091
Implement CACert queries in SecurityController

Cherry-pick note:
testCACertLoader() was flaky, so this cherry-pick contains
two attempted fixes and a CL that disables the test. The original commit
messages of the squashed CLs are below.
Merged-In: I3b9cc3d85c9f49d0a892613b63d1fba184ab647e

Implement CACert queries in SecurityController

Queries are run (on a AsyncTask) when user is switched and when
ACTION_TRUST_STORE_CHANGED is broadcasted. Otherwise, the result is cached
in the SecurityController.

Bug: 37535489
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java
Change-Id: I3b9cc3d85c9f49d0a892613b63d1fba184ab647e

Increase timeout for flaky testCACertLoader()

Bug: 37535489
Bug: 38045871
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java
Change-Id: I5778082973af7c6d4d719b83e334fec552b0a89e

Fix flaky SecurityControllerTest.testCaCertLoader

Fixes: 38108698
Test: runtest -c .statusbar.policy.SecurityControllerTest systemui
Change-Id: I6029a09984b72599622f0df57187a20aba4dab30

Disable flaky test

Test: treehugger
Bug: 38118260
Change-Id: I05c6504acee6a787e1cc5071bed0118388963212

(cherry picked from commit e375fc441cc889890d1cff5bc771039bb65f08ef)
keystore/java/android/security/KeyChain.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java