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 /packages/VpnDialogs/src | |
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 'packages/VpnDialogs/src')
-rw-r--r-- | packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java index 96de1b9..42b8cce 100644 --- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java +++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java @@ -65,11 +65,18 @@ public class ManageDialog extends AlertActivity implements } try { - mConfig = getIntent().getParcelableExtra("config"); mService = IConnectivityManager.Stub.asInterface( ServiceManager.getService(Context.CONNECTIVITY_SERVICE)); + mConfig = mService.getVpnConfig(); + + // mConfig can be null if we are a restricted user, in that case don't show this dialog + if (mConfig == null) { + finish(); + return; + } + View view = View.inflate(this, R.layout.manage, null); if (mConfig.session != null) { ((TextView) view.findViewById(R.id.session)).setText(mConfig.session); |