commit c2a74064b983615aba6f7fd853f3d0a72d9897d9
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 11 18:56:19 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 11 18:56:19 2017 +0000
tree f739cce72c544290b69063c071715881386c65e6
parent 5956489768410fd3e266dc9563d7e39b6fcf2218
parent a773f48d439a4a3035c81527f187aab0faf404cd

Merge "DO NOT MERGE: Fix OsTest#test_xattr_Errno test on CTS" into oreo-cts-dev

support/src/test/java/libcore/java/security/StandardNames.java

diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java
index db5d0b1..43a272b 100644
--- a/support/src/test/java/libcore/java/security/StandardNames.java
+++ b/support/src/test/java/libcore/java/security/StandardNames.java
@@ -626,7 +626,10 @@
             if (Security.getProvider("TimaKeyStore") != null) {
                 provide("KeyStore", "TimaKeyStore");
             }
-
+            // KnoxAndroidKeyStore provider
+            if (Security.getProvider("KnoxAndroidKeyStore") != null) {
+                provide("KeyStore", "KnoxAndroidKeyStore");
+            }
         }
 
         if (IS_RI) {