History log of /packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
290784afded5426d5b1d0cb7d71586237445c802 07-Jul-2015 Robin Lee <rgl@google.com> Match getLegacyVpn calls to changed interface

The userId argument is now explicit. Pre-requisite for bug 21499103

Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
614fc178bf028ef66bea24a70ae476a91833a7f1 26-Jun-2015 Robin Lee <rgl@google.com> Fix build

Change-Id: Ibb2db14b2fd38b2c8c066c97f8cd6e396c104ce8
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
dd142295da8912c1f2d972341abb2e5b761075e9 26-Jun-2015 Robin Lee <rgl@google.com> Enable VPN settings for secondary users

This is now supported.

Change-Id: I4a8eabe3042c04061f293066e84238029f18ecd8
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
5f6f4cc572589674196e836904c4b27f84f21934 18-Jun-2015 Robin Lee <rgl@google.com> Only unregister the network callback at onPause

Bug: 21592804
Change-Id: I425a8ebd350125ae48b9cf44cfef0b4c572ec25e
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
3848407d0c2fad920419d6b925e0c8e374502680 08-Jun-2015 Alex Klyubin <klyubin@google.com> Switch from KeyStore.saw to KeyStore.list.

KeyStore.saw was renamed to KeyStore.list for clarity. The
implementation of both methods is exactly the same.

Bug: 18088752
Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
a5df4779a04331294c15e6d22d749a734b59400f 02-Jun-2015 Nicolas Prevot <nprevot@google.com> Don't allow secondary users apps to start restricted Settings fragment.

On a secondary user, the fragments ApnSettings, TetherSettings and VpnSettings
should not be started.

But an app can still send an intent to start these fragments.
Prevent this by checkin the userId in these fragments.

BUG:15313261
BUG:15312781
BUG:15312494

Change-Id: I2a36bb89a8e37e4440aa28372d7a1800b33dae37
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
c4096053564fd7b4d9d1dfcee7f1661bc4b0e59a 02-Jun-2015 Robin Lee <rgl@google.com> Clear connected legacy VPN during rescan

Change-Id: I0fec37b3f73ce5b538721d79e78e1128d7667380
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
01b35bcae307907bd8aaaa9cf23fa50f70e5f491 12-May-2015 Robin Lee <rgl@google.com> VPN: UI for forgetting disconnected VPNs

Made possible by expanded internal VPN APIs.

Bug: 20872408
Bug: 20692490
Bug: 20747154
Change-Id: Idc87084a130afa18b27c85cc9d4b5033dcedaabe
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
ab6a65c03b2505ed2cce0226e11ef2d566699cf4 01-May-2015 Robin Lee <rgl@google.com> VPN: Convert current-context IPCs to user context

These fetch info for the wrong user, which may be either wrong or worse
wholly nonexistent.

Bug: 20747154
Change-Id: Ibd5f2e5d3c5dfd252a032ebdfe204de7166fa3a5
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
2bd92d5d0685144aad566b9d29454fb519ff0371 09-Apr-2015 Robin Lee <rgl@google.com> vpn2: show third-party VPN services

VPN apps are shown alongside configured VPNs now. The requirement that
a password is set is now only enforced when setting up a configured
VPN as this is not necessary for apps.

Some UI redesign.

Bug: 19573824
Bug: 17474682
Bug: 19575658
Change-Id: I02bd977136929647d65b9784fb4cc5df24b45428
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
8a963babe2e36b7a41f77b8d2598c97658196e58 20-Mar-2015 Chris Wren <cwren@android.com> log visibility of views

Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
9a23adf69dc53126c9858b19760eab5b67c23b97 18-Mar-2015 John Spurlock <jspurlock@google.com> Settings: Remove all unused imports.

Change-Id: Iebfa52cb849d69974c94902b0b020893cf5618a3
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
b2bb1973fe32f2a52cb27155e525798c6a4eca6d 22-Aug-2014 Jeff Davidson <jpd@google.com> Restore legacy VPN stats dialog.

Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
90b3b211efda80535ac2981032f66e117ffeb221 13-Aug-2014 Jeff Davidson <jpd@google.com> Less intrusive VPN dialog.

Add new AppOps to Settings and remove references to obsolete
ManageDialog. VPN UX now lives in Quick Settings.

Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
c17bdbf849e45a6c445d0f4885b18ae9128487c9 12-Aug-2014 Adam Powell <adamp@google.com> Use material alert dialog item view layout

Bug 16552638

Change-Id: I6d0d5c2c3d8cc7064828d223134b020a3a0ca828
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
1e6653a1b516ad86f43dcb4032d21a27878c2618 13-Aug-2014 Zoltan Szatmary-Ban <szatmz@google.com> Remove spinner in Settings > VPN

This CL reverses an earlier change https://googleplex-android-review.git.corp.google.com/#/c/515209

Bug:16030111
Change-Id: I981bd8a5ab03c56b78f38c6016277aa15548adba
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
ca90af1064f966c1ef764a3388020c94ba4a1121 31-Jul-2014 Zoltan Szatmary-Ban <szatmz@google.com> Toggle between profiles in VPN Settings

This adds a spinner to the VPN settings screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug:16030111
Change-Id: I3b800264c634900412e8eebdbcf43a2b6913c2be
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
ee27b9de8f2ab17d50b90dd8c13546aebb4e9fc1 09-May-2014 Julia Reynolds <juliacr@google.com> Settings user restriction changes: wireless & networks changes.

Bug: 14081992
Change-Id: I32b0f06da7e7ff9bd8303ce26be2584e6cddbedc
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
14415168b170bd20ec158a2c40feb70a9f888c3c 13-Apr-2013 Kenny Root <kroot@google.com> Remove old KeyStore API call sites

Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.

Bug: 8122243
Change-Id: I59e38efbab6ad60a905ce8678a340da2088b19c9
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
1a55f95d45d2be39f3206cf1a4c3a1affd98cd92 22-Feb-2013 Jeff Sharkey <jsharkey@android.com> Explicit GridLayout alignment to fix warnings.

Also show lockdown VPN dialog whenever relaunched.

Change-Id: Ib8aecbd4a7f9d61906f65fee39f1e819c79aabb4
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
8b78299d94ebb09fb9bf2bc7fb0015d2f1950839 21-Feb-2013 Jeff Sharkey <jsharkey@android.com> Improve notification UI for lockdown VPN.

Bug: 7064111
Change-Id: I951c1c116d2e0e22d1b32194d38f1431e806cbca
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
ca714d8d0c11c904b25bc20a0a9b2f2cc8d78ad5 14-Feb-2013 Kenny Root <kroot@google.com> KeyStore: stop using state()

Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
88b0140241c646c87d356748621cef28a3105466 27-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Precreate a data structure so it's never null.

Fixes NPE that the fast-fingered monkey sometimes triggers.
bug:7084178

Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
07d465ddb8629f128dde193d22de28cfd56663ca 24-Sep-2012 Jeff Sharkey <jsharkey@android.com> Hide lockdown VPN when IMS auth is required.

Bug: 7069782
Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
f5de1db28a61d159e62ef42f64a2cdcb316d0c2c 19-Sep-2012 Jeff Sharkey <jsharkey@android.com> Omit PPTP VPNs from lockdown list.

Bug: 7064069
Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
9fd7ac1ec7c0c3984f225a237bd6e3dbafc7f831 25-Aug-2012 Jeff Sharkey <jsharkey@android.com> Always-on VPN.

Adds support for always-on VPN profiles. Users pick an always-on VPN
from list of existing VPN profiles, which must use an IP address for
both VPN server and DNS. Moved "add" operation into action bar.

Bug: 5756357
Change-Id: I4c7ed7f2a3b027be1baf65c08213336a61f3acfe
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
745e6212e71f6fe9da863c9c9f7b092542929449 24-Aug-2012 Jeff Sharkey <jsharkey@android.com> Migrate legacy VPN arguments to system_server.

Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.

Bug: 5756357
Change-Id: Ied048ca465aab03b2ae1c004388f49b82848b3f7
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
c6e84c09590ec5e4da287fba32dd53775156ae76 20-Jul-2012 Jeff Sharkey <jsharkey@android.com> Migrate VpnProfile definition to framework.

Bug: 5756357
Change-Id: Icf4b2cb10e911216a2165f2afd1eb89152c5f1c0
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
b0b37ae21c172491bc170659b5f429601858ddc1 24-Apr-2012 Amith Yamasani <yamasani@google.com> Help menus for several screens.

Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
455a911df39ac0c55f80c191a1a8c11c4aa08268 21-Mar-2012 Kenny Root <kroot@google.com> Switch VPN to use keystore ENGINE

The VPN client will no longer receive the private key material directly
from the caller. Instead it will use the keystore OpenSSL ENGINE to
request that keystore does private key operations on its behalf.

We only pass the keystore key alias to the private key instead of the
private key itself now.

Change-Id: I4ea2abda5ab7dec7d7ef5f451b96fef5bc92d811
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
94cc1bbf3218a020548a90032ec34f608f4cefdb 01-Mar-2012 Chia-chi Yeh <chiachi@android.com> VpnSettings: show more error messages when VPN fails.

Bug: 6032883
Change-Id: Idc49e1b611fd0c01f199bfde984084a8e4c62e17
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
f5317a151bef8d93f7a640fe46c6dcde6baa258d 07-Dec-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: add support for server certificates.

Bug: 5714397
Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
6d4334be691815cd9615b0fdebb756999a9c06a3 08-Aug-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: fix bugs.

1. Support identifier in L2TP/IPSec PSK.
2. Fix profile validation for IPSec Hybrid RSA.
3. Fix crash when the user does not want to initialize keystore.

Change-Id: Id46dbbc84915dfb69f8bab6b540426e7614ab7c6
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
d5a5de4de6df9ebd979c11bbd1e850f787b3ffee 04-Aug-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: the field has been renamed.

Change-Id: I1e234e96d0fa4af6f03a5b902073460acffd8e28
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
d68dbe29bb0a6639bfd95449eb28e7d4b174a3fe 28-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: make more fields available as advanced options.

Now users can manually override DNS search domains, DNS servers,
and forwarding routes for each VPN network.

Change-Id: I10b8e383ac19fd19d23938dff78201a71724d58f
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
d501b5c963c0cbcc9c666f502229599464eaf3fd 15-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: bind OnPreferenceClickListener later.

Bug: 4999108

Change-Id: Idab3029a30943d1118584e6a1b01db96340858ed
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
f35130dd79c100097025585c0b5a5ebbd38a414e 15-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: generate arguments for IPSec XAUTH VPNs.

Change-Id: I70d5e93f0d431d9d6cc64324ce2c37129d1a2a88
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
413b171159cec5ad1e7b3cf4f1f842b5f2debc05 07-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: pass certificates to racoon directly.

Also fix some style issues.

Change-Id: I7ca46d0cc3038f21ef5904d4515e90907a21d613
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
97fd85fd9776f3fb5c35217e82bcbcb5aea8416d 04-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: add status report.

Change-Id: Ia050d997524b39868e6acce82d12b0415909ab77
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
5c9e37c295a0219731882eca7a8805a08a439c34 03-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: rename some variables.

Change-Id: I0550bebc55a42ad11768729d098ff5258442747e
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
d95ec871138ebb367cfd8b67b4814438ac30c628 03-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: hook up the legacy VPN with IConnectivityManager.

The status report is not implemented yet.

Change-Id: I266f840371e3698f779124d5e67bafe4d272cd94
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
bbb5094be6673929bcb808cdeaf748a73be4dbf0 30-Jun-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs.

Change-Id: Ia58afa2f6f6d4b1b208bf6b893b8b7712154bdbf
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java
310d619acba5cd1f7c8a55aa7906ed4f1c011bd8 27-Jun-2011 Chia-chi Yeh <chiachi@android.com> Settings: revise VpnSettings.

Make the style closer to other settings.
Profiles are saved in KeyStore with optional account information.
Not adapt to IConnectivityManager yet.

Change-Id: I9d7a0c14b253a0b355499c5e558b0761fa24ea22
/packages/apps/Settings/src/com/android/settings/vpn2/VpnSettings.java