Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test." am: 414d53442e (63522e8f) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_devicepolicy_CryptoTestHelper.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@
	namespace {		namespace {

	static jint runSelfTest(JNIEnv* env, jobject /* clazz */) {		static jint runSelfTest(JNIEnv* env, jobject /* clazz */) {
	return BORINGSSL_self_test();		return FIPS_mode();
	}		}

	static const JNINativeMethod methods[] = {		static const JNINativeMethod methods[] = {