Merge change 6204 into donut

* changes:
  Migrate to new keystore with the CertTool lib.

1 files changed, 4 insertions, 4 deletions

diff --git a/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java b/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java
index bd14110..825953c 100644
--- a/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java
+++ b/packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java
@@ -17,7 +17,7 @@
 package com.android.server.vpn;
 
 import android.net.vpn.L2tpIpsecProfile;
-import android.security.Keystore;
+import android.security.CertTool;
 
 import java.io.IOException;
 
@@ -48,17 +48,17 @@ class L2tpIpsecService extends VpnService<L2tpIpsecProfile> {
     }
 
     private String getCaCertPath() {
-        return Keystore.getInstance().getCaCertificate(
+        return CertTool.getInstance().getCaCertificate(
                 getProfile().getCaCertificate());
     }
 
     private String getUserCertPath() {
-        return Keystore.getInstance().getUserCertificate(
+        return CertTool.getInstance().getUserCertificate(
                 getProfile().getUserCertificate());
     }
 
     private String getUserkeyPath() {
-        return Keystore.getInstance().getUserPrivateKey(
+        return CertTool.getInstance().getUserPrivateKey(
                 getProfile().getUserCertificate());
     }
 }