Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test." am: 414d53442e

am: 80809d6d5a

Change-Id: I938bdb6cf443f97895427e71f75e11f15ae5e7e8

services/core/jni/com_android_server_devicepolicy_CryptoTestHelper.cpp

@@ -22,7 +22,7 @@
 namespace {
 
 static jint runSelfTest(JNIEnv* env, jobject /* clazz */) {
-    return BORINGSSL_self_test();
+    return FIPS_mode();
 }
 
 static const JNINativeMethod methods[] = {
@@ -39,4 +39,4 @@ int register_android_server_devicepolicy_CryptoTestHelper(JNIEnv *env) {
             env, "com/android/server/devicepolicy/CryptoTestHelper", methods, NELEM(methods));
 }
 
-} // namespace android
+} // namespace android