Commit bf31fa46 authored Sep 13, 2019 by Tobias Thierer Committed by android-build-merger Sep 13, 2019

Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test."...

Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test." am: 414d5344 am: 80809d6d am: 63522e8f
am: 1bf5329a

Change-Id: I0cd57d365985a4e0031848bceaee8bccdf2e563e

parents 5d38ef8c 1bf5329a

services/core/jni/com_android_server_devicepolicy_CryptoTestHelper.cpp

+2 −2

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

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

		static const JNINativeMethod methods[] = {