Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bba52f6 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 2cf3971e: Merge change 4460 into donut 

Merge commit '2cf3971e'

* commit '2cf3971e':
  Use the new keystore API in vpn service.
parents dd34fb05 2cf3971e

packages/VpnServices/src/com/android/server/vpn/L2tpIpsecService.java

+4 −3
Original line number Diff line number Diff line
@@ -50,16 +50,17 @@ class L2tpIpsecService extends VpnService<L2tpIpsecProfile> { 
    }



    private String getCaCertPath() {

        return Keystore.getInstance().getCertificate(

        return Keystore.getInstance().getCaCertificate(

                getProfile().getCaCertificate());

    }



    private String getUserCertPath() {

        return Keystore.getInstance().getCertificate(

        return Keystore.getInstance().getUserCertificate(

                getProfile().getUserCertificate());

    }



    private String getUserkeyPath() {

        return Keystore.getInstance().getUserkey(getProfile().getUserkey());

        return Keystore.getInstance().getUserPrivateKey(

                getProfile().getUserCertificate());

    }

}