commit f48612d6104fd6a5b0b70b12a2c0ba3c22e3a42d
author Sami Tolvanen <samitolvanen@google.com> Thu Jul 09 13:57:32 2015 +0100
committer Sami Tolvanen <samitolvanen@google.com> Wed Aug 12 13:27:47 2015 +0100
tree f61ba3906750736f7c2e3d1d0e03373850aed22b
parent 7d0be0f361ec012edd91082f490e24daaeafae40

CTS test for device encryption

Verify that CPU specific optimizations are enabled in kernel and
require encryption unless performance is below threshold.

Bug: 22297300
Change-Id: Ib7f8774e57e046b61b15e5c36fcfb01548e2c26a

tests/tests/security/jni/CtsSecurityJniOnLoad.cpp

diff --git a/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp b/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
index 1051a82..c60b866 100644
--- a/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
+++ b/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
@@ -25,6 +25,7 @@
 extern int register_android_security_cts_SELinuxTest(JNIEnv*);
 extern int register_android_security_cts_MMapExecutableTest(JNIEnv* env);
 extern int register_android_security_cts_AudioPolicyBinderTest(JNIEnv* env);
+extern int register_android_security_cts_EncryptionTest(JNIEnv* env);
 
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     JNIEnv *env = NULL;
@@ -65,5 +66,9 @@
         return JNI_ERR;
     }
 
+    if (register_android_security_cts_EncryptionTest(env)) {
+        return JNI_ERR;
+    }
+
     return JNI_VERSION_1_4;
 }