bf6ff2c025405a3af496fe558dfc4468a9b45cc8 - SHIFTPHONES/android_frameworks_base

commit	bf6ff2c025405a3af496fe558dfc4468a9b45cc8	[log] [tgz]
author	Chad Brubaker <cbrubaker@google.com>	Tue Jul 16 18:59:12 2013 -0700
committer	Chad Brubaker <cbrubaker@google.com>	Tue Jul 16 18:59:12 2013 -0700
tree	0a2ab3144251b9d9b6b60ae2b7c149c88e563222
parent	d1c87546b37658fbc38cb33504cc726a07e0c4ea [diff]

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

core/java/android/net/IConnectivityManager.aidl[diff]
core/java/com/android/internal/net/VpnConfig.java[diff]
packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java[diff]
services/java/com/android/server/ConnectivityService.java[diff]
services/java/com/android/server/connectivity/Vpn.java[diff]

5 files changed

tree: 0a2ab3144251b9d9b6b60ae2b7c149c88e563222