Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add getLegacyVpnInfoPrivileged method"

Browse Source
This commit is contained in:
Robert Greenwalt
2015-03-26 22:01:32 +00:00
committed by Gerrit Code Review
parent 5fc9b336eb 08bbca040f
commit 727cac07cc
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -1009,6 +1009,14 @@ public class Vpn {
public synchronized LegacyVpnInfo getLegacyVpnInfo() { public synchronized LegacyVpnInfo getLegacyVpnInfo() {
// Check if the caller is authorized. // Check if the caller is authorized.
enforceControlPermission(); 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; if (mLegacyVpnRunner == null) return null;
final LegacyVpnInfo info = new LegacyVpnInfo(); final LegacyVpnInfo info = new LegacyVpnInfo();