diff options
| author | Robin Lee <rgl@google.com> | 2017-02-08 21:27:02 +0000 |
|---|---|---|
| committer | Robin Lee <rgl@google.com> | 2017-02-14 13:29:31 +0000 |
| commit | 7f5c91c6bce6a8ff2414549219a321a98a98ab31 (patch) | |
| tree | ad73588c43eed6d0f29b368b8e3faa3f00562258 /keystore/java/android/security/KeyChain.java | |
| parent | f9a55d42d2e2adbf5895d04e4790debb145508ed (diff) | |
MonitoringCertTask no longer relies on software.device_admin
Added a test to validate that it still works the way it should before
and after the change.
Bug: 33258404
Bug: 35196414
Fix: 35129745
Test: runtest -x services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: also manual, instructions:
Test: (1) Disable software.device_admin from tablet_core_hardware, rebuild.
Test: (2) Install CA cert. Notification should appear.
Test: (3) Reboot. Notification should still be there.
Change-Id: Id992725c1844a2fffbde4d8acaba531e99f853ad
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index e566b9d75846..9981668b7cca 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -588,7 +588,7 @@ public final class KeyChain { * @hide for reuse by CertInstaller and Settings. * @see KeyChain#bind */ - public final static class KeyChainConnection implements Closeable { + public static class KeyChainConnection implements Closeable { private final Context context; private final ServiceConnection serviceConnection; private final IKeyChainService service; |