From 4a08a1d37e1b528008f2e559a0db4d7fb965a28b Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Wed, 22 Jan 2020 14:00:41 -0800
Subject: [PATCH] Move cacerts_wfa from system to Wifi APEX

Bug: 145199837
Test: atest android.security.cts.CertificateTest
Change-Id: I16a6376a01491455f3a2ce69ab57763c99353952
---
 .../android/security/net/config/WfaCertificateSource.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/android/security/net/config/WfaCertificateSource.java b/core/java/android/security/net/config/WfaCertificateSource.java
index f212ef8bf447f..545e4b0926b1d 100644
--- a/core/java/android/security/net/config/WfaCertificateSource.java
+++ b/core/java/android/security/net/config/WfaCertificateSource.java
@@ -23,12 +23,15 @@ import java.io.File;
  * @hide
  */
 public final class WfaCertificateSource extends DirectoryCertificateSource {
+    private static final String CACERTS_WFA_PATH =
+            "/apex/com.android.wifi/etc/security/cacerts_wfa";
+
     private static class NoPreloadHolder {
         private static final WfaCertificateSource INSTANCE = new WfaCertificateSource();
     }
 
     private WfaCertificateSource() {
-        super(new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts_wfa"));
+        super(new File(CACERTS_WFA_PATH));
     }
 
     public static WfaCertificateSource getInstance() {