Merge "Add systemProperty checking for updatable certs and modify tests." (042dc5fb) · Commits · e / os / android_frameworks_base

core/java/android/security/net/config/SystemCertificateSource.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -39,9 +39,13 @@ public final class SystemCertificateSource extends DirectoryCertificateSource {
		}

		private static File getDirectory() {
		// TODO(miguelaranda): figure out correct code path.
		if ((System.getProperty("system.certs.enabled") != null)
		&& (System.getProperty("system.certs.enabled")).equals("true")) {
		return new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts");
		}
		File updatable_dir = new File("/apex/com.android.conscrypt/cacerts");
		if (updatable_dir.exists() && !(updatable_dir.list().length == 0)) {
		if (updatable_dir.exists()
		&& !(updatable_dir.list().length == 0)) {
		return updatable_dir;
		}
		return new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts");