From bf6ff2c025405a3af496fe558dfc4468a9b45cc8 Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Tue, 16 Jul 2013 18:59:12 -0700 Subject: Support multiple Vpn ManageDialogs Move away from storing the configs in the Intent to prevent issues with PendingIntents and multiple configs. The Dialog now queries ConnectivityService for the configuration to display in the management dialog. Change-Id: I0e0ef52db840152914d117a24f776d8106e836ff --- services/java/com/android/server/ConnectivityService.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'services/java/com/android/server/ConnectivityService.java') diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 476a6fdffb1a..3a4b7e382f57 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -3425,6 +3425,20 @@ public class ConnectivityService extends IConnectivityManager.Stub { } } + /** + * Returns the information of the ongoing VPN. This method is used by VpnDialogs and + * not available in ConnectivityManager. + * Permissions are checked in Vpn class. + * @hide + */ + @Override + public VpnConfig getVpnConfig() { + int user = UserHandle.getUserId(Binder.getCallingUid()); + synchronized(mVpns) { + return mVpns.get(user).getVpnConfig(); + } + } + /** * Callback for VPN subsystem. Currently VPN is not adapted to the service * through NetworkStateTracker since it works differently. For example, it -- cgit v1.2.3