diff options
| -rw-r--r-- | apex/Android.bp | 6 | ||||
| -rw-r--r-- | service/Android.bp | 1 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/hotspot2/WfaKeyStore.java | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index a758067a23..e143d03014 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -21,6 +21,12 @@ apex_defaults { "wifi-service", "framework-wifi", ], + // from build rule `cacerts_wfa` + prebuilts: [ + "target-cacert-wifi-674b5f5b.0", + "target-cacert-wifi-21125ccd.0", + "target-cacert-wifi-ea93cb5b.0", + ], init_rc: [":wifi-init-rc"], key: "com.android.wifi.key", certificate: ":com.android.wifi.certificate", diff --git a/service/Android.bp b/service/Android.bp index 51b11e6591..0fd8fe0ea7 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -114,7 +114,6 @@ java_library { sdk_version: "core_platform", required: [ - "cacerts_wfa", "services", "wifi-service-resources", ], diff --git a/service/java/com/android/server/wifi/hotspot2/WfaKeyStore.java b/service/java/com/android/server/wifi/hotspot2/WfaKeyStore.java index c85f7f9639..b670097511 100644 --- a/service/java/com/android/server/wifi/hotspot2/WfaKeyStore.java +++ b/service/java/com/android/server/wifi/hotspot2/WfaKeyStore.java @@ -16,7 +16,6 @@ package com.android.server.wifi.hotspot2; -import android.os.Environment; import android.util.Log; import java.io.IOException; @@ -32,10 +31,8 @@ import java.util.Set; */ public class WfaKeyStore { private static final String TAG = "PasspointWfaKeyStore"; - // The WFA Root certs are checked in to /system/ca-certificates/cacerts_wfa - // The location on device is configured in the corresponding Android.mk /* package */ static final String DEFAULT_WFA_CERT_DIR = - Environment.getRootDirectory() + "/etc/security/cacerts_wfa"; + "/apex/com.android.wifi/etc/security/cacerts_wfa"; private boolean mVerboseLoggingEnabled = false; private KeyStore mKeyStore = null; |