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

Commit 94b17bdd authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 0a5abe58: am 727cac07: Merge "Add getLegacyVpnInfoPrivileged method"

* commit '0a5abe58':
  Add getLegacyVpnInfoPrivileged method
parents e600ba7e 0a5abe58
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -1021,6 +1021,14 @@ public class Vpn {
    public synchronized LegacyVpnInfo getLegacyVpnInfo() {
        // Check if the caller is authorized.
        enforceControlPermission();
        return getLegacyVpnInfoPrivileged();
    }

    /**
     * Return the information of the current ongoing legacy VPN.
     * Callers are responsible for checking permissions if needed.
     */
    public synchronized LegacyVpnInfo getLegacyVpnInfoPrivileged() {
        if (mLegacyVpnRunner == null) return null;

        final LegacyVpnInfo info = new LegacyVpnInfo();