diff options
author | Chad Brubaker <cbrubaker@google.com> | 2013-07-16 18:59:12 -0700 |
---|---|---|
committer | Chad Brubaker <cbrubaker@google.com> | 2013-07-16 18:59:12 -0700 |
commit | bf6ff2c025405a3af496fe558dfc4468a9b45cc8 (patch) | |
tree | 0a2ab3144251b9d9b6b60ae2b7c149c88e563222 /core/java | |
parent | d1c87546b37658fbc38cb33504cc726a07e0c4ea (diff) | |
download | frameworks_base-bf6ff2c025405a3af496fe558dfc4468a9b45cc8.zip frameworks_base-bf6ff2c025405a3af496fe558dfc4468a9b45cc8.tar.gz frameworks_base-bf6ff2c025405a3af496fe558dfc4468a9b45cc8.tar.bz2 |
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
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/net/IConnectivityManager.aidl | 2 | ||||
-rw-r--r-- | core/java/com/android/internal/net/VpnConfig.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index d537b32..0a476eb 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -124,6 +124,8 @@ interface IConnectivityManager ParcelFileDescriptor establishVpn(in VpnConfig config); + VpnConfig getVpnConfig(); + void startLegacyVpn(in VpnProfile profile); LegacyVpnInfo getLegacyVpnInfo(); diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java index abf99a3..98599d0 100644 --- a/core/java/com/android/internal/net/VpnConfig.java +++ b/core/java/com/android/internal/net/VpnConfig.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.Intent; import android.os.Parcel; import android.os.Parcelable; +import android.os.UserHandle; import android.net.RouteInfo; import android.net.LinkAddress; @@ -50,15 +51,12 @@ public class VpnConfig implements Parcelable { return intent; } - public static PendingIntent getIntentForStatusPanel(Context context, VpnConfig config) { - Preconditions.checkNotNull(config); - + public static PendingIntent getIntentForStatusPanel(Context context) { Intent intent = new Intent(); intent.setClassName(DIALOGS_PACKAGE, DIALOGS_PACKAGE + ".ManageDialog"); - intent.putExtra("config", config); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT); + return PendingIntent.getActivityAsUser(context, 0, intent, 0, null, UserHandle.CURRENT); } public String user; |