summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/vpn2
Commit message (Collapse)AuthorAgeFilesLines
* Unconfigure the lockdown VPN if the user forgets its profile.Lorenzo Colitti2015-10-131-1/+14
| | | | | | | | | | | | | | | Currently, if the user clicks "forget" on the configuration dialog for the profile that is currently being used by the always-on VPN, we don't disable the lockdown VPN, and we crash on next boot because ConnectivityService tries to start LockdownVpnTracker with an invalid configuration. Fix this by removing the LOCKDOWN_VPN variable in the keystore (which disables the always-on VPN), and notifying ConnectivityService. Bug: 23625458 Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
* Merge "Match getLegacyVpn calls to changed interface" into mnc-devRobin Lee2015-07-102-2/+2
|\
| * Match getLegacyVpn calls to changed interfaceRobin Lee2015-07-072-2/+2
| | | | | | | | | | | | The userId argument is now explicit. Pre-requisite for bug 21499103 Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
* | Restore Vpn advanced options on re-init or rotateRobin Lee2015-07-061-11/+28
|/ | | | | | | Visibility isn't restored as part of instance state by default. Bug: 22183281 Change-Id: I86a7165e918251bc32f6884b9ad5f9c5987ca075
* Fix buildRobin Lee2015-06-251-1/+1
| | | | Change-Id: Ibb2db14b2fd38b2c8c066c97f8cd6e396c104ce8
* Enable VPN settings for secondary usersRobin Lee2015-06-251-2/+8
| | | | | | This is now supported. Change-Id: I4a8eabe3042c04061f293066e84238029f18ecd8
* Only unregister the network callback at onPauseRobin Lee2015-06-171-7/+1
| | | | | Bug: 21592804 Change-Id: I425a8ebd350125ae48b9cf44cfef0b4c572ec25e
* Switch from KeyStore.saw to KeyStore.list.Alex Klyubin2015-06-082-2/+2
| | | | | | | | KeyStore.saw was renamed to KeyStore.list for clarity. The implementation of both methods is exactly the same. Bug: 18088752 Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1
* Don't allow secondary users apps to start restricted Settings fragment.Nicolas Prevot2015-06-021-1/+2
| | | | | | | | | | | | | | 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
* Clear connected legacy VPN during rescanRobin Lee2015-06-011-0/+1
| | | | Change-Id: I0fec37b3f73ce5b538721d79e78e1128d7667380
* VPN: UI for forgetting disconnected VPNsRobin Lee2015-05-184-103/+97
| | | | | | | | | Made possible by expanded internal VPN APIs. Bug: 20872408 Bug: 20692490 Bug: 20747154 Change-Id: Idc87084a130afa18b27c85cc9d4b5033dcedaabe
* VPN: Convert current-context IPCs to user contextRobin Lee2015-05-054-42/+47
| | | | | | | | These fetch info for the wrong user, which may be either wrong or worse wholly nonexistent. Bug: 20747154 Change-Id: Ibd5f2e5d3c5dfd252a032ebdfe204de7166fa3a5
* vpn2: show third-party VPN servicesRobin Lee2015-04-219-394/+1024
| | | | | | | | | | | | | 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
* log visibility of viewsChris Wren2015-03-271-0/+6
| | | | | Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
* Settings: Remove all unused imports.John Spurlock2015-03-182-3/+0
| | | | Change-Id: Iebfa52cb849d69974c94902b0b020893cf5618a3
* Restore legacy VPN stats dialog.Jeff Davidson2014-08-221-0/+9
| | | | | | | | | | 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
* Less intrusive VPN dialog.Jeff Davidson2014-08-151-10/+2
| | | | | | | | | 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
* Use material alert dialog item view layoutAdam Powell2014-08-141-1/+1
| | | | | | Bug 16552638 Change-Id: I6d0d5c2c3d8cc7064828d223134b020a3a0ca828
* Remove spinner in Settings > VPNZoltan Szatmary-Ban2014-08-131-47/+1
| | | | | | | This CL reverses an earlier change https://googleplex-android-review.git.corp.google.com/#/c/515209 Bug:16030111 Change-Id: I981bd8a5ab03c56b78f38c6016277aa15548adba
* Toggle between profiles in VPN SettingsZoltan Szatmary-Ban2014-08-011-1/+48
| | | | | | | | | 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
* Settings user restriction changes: wireless & networks changes.Julia Reynolds2014-05-291-0/+27
| | | | | Bug: 14081992 Change-Id: I32b0f06da7e7ff9bd8303ce26be2584e6cddbedc
* Remove old KeyStore API call sitesKenny Root2013-04-121-2/+4
| | | | | | | | 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
* Explicit GridLayout alignment to fix warnings.Jeff Sharkey2013-02-211-6/+6
| | | | | | Also show lockdown VPN dialog whenever relaunched. Change-Id: Ib8aecbd4a7f9d61906f65fee39f1e819c79aabb4
* Improve notification UI for lockdown VPN.Jeff Sharkey2013-02-211-0/+8
| | | | | Bug: 7064111 Change-Id: I951c1c116d2e0e22d1b32194d38f1431e806cbca
* KeyStore: stop using state()Kenny Root2013-02-141-1/+1
| | | | Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
* Precreate a data structure so it's never null.Robert Greenwalt2012-09-271-3/+2
| | | | | | | Fixes NPE that the fast-fingered monkey sometimes triggers. bug:7084178 Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
* Hide lockdown VPN when IMS auth is required.Jeff Sharkey2012-09-241-0/+11
| | | | | Bug: 7069782 Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
* Omit PPTP VPNs from lockdown list.Jeff Sharkey2012-09-191-3/+4
| | | | | Bug: 7064069 Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9
* Always-on VPN.Jeff Sharkey2012-08-261-21/+162
| | | | | | | | | 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
* Migrate legacy VPN arguments to system_server.Jeff Sharkey2012-08-241-135/+5
| | | | | | | | Generate the racoon and mtpd daemon arguments in system_server, instead of accepting them from Settings. Bug: 5756357 Change-Id: Ied048ca465aab03b2ae1c004388f49b82848b3f7
* Migrate VpnProfile definition to framework.Jeff Sharkey2012-07-193-121/+2
| | | | | Bug: 5756357 Change-Id: Icf4b2cb10e911216a2165f2afd1eb89152c5f1c0
* Help menus for several screens.Amith Yamasani2012-04-231-0/+5
| | | | | Bug: 5144896 Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
* Switch VPN to use keystore ENGINEKenny Root2012-03-211-3/+6
| | | | | | | | | | | 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
* VpnSettings: show more error messages when VPN fails.Chia-chi Yeh2012-02-291-1/+5
| | | | | Bug: 6032883 Change-Id: Idc49e1b611fd0c01f199bfde984084a8e4c62e17
* VpnSettings: use USER_PRIVATE_KEY to list user certificates.Chia-chi Yeh2011-12-271-1/+1
| | | | Change-Id: Iba547331d00ddfe24dd5eda3a9ee70c9d17969d0
* am 325c912a: Merge "VpnSettings: add support for server certificates." into ↵Chia-chi Yeh2011-12-073-10/+26
|\ | | | | | | | | | | | | ics-mr1 * commit '325c912ae64e9559cf2e84d5c94d81a0e8a15c48': VpnSettings: add support for server certificates.
| * VpnSettings: add support for server certificates.Chia-chi Yeh2011-12-063-10/+26
| | | | | | | | | | Bug: 5714397 Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a
* | VpnSettings: do not copy unsaved fields.Chia-chi Yeh2011-11-021-2/+4
|/ | | | | Bug: 5554228 Change-Id: I1f1d6d89f99c728e48e2abe00920a1f36bd53576
* VpnSettings: fix bugs.Chia-chi Yeh2011-08-082-12/+13
| | | | | | | | 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
* VpnSettings: the field has been renamed.Chia-chi Yeh2011-08-031-1/+1
| | | | Change-Id: I1e234e96d0fa4af6f03a5b902073460acffd8e28
* VpnSettings: make more fields available as advanced options.Chia-chi Yeh2011-07-272-5/+65
| | | | | | | Now users can manually override DNS search domains, DNS servers, and forwarding routes for each VPN network. Change-Id: I10b8e383ac19fd19d23938dff78201a71724d58f
* VpnSettings: use the real passwords instead of dummy strings.Chia-chi Yeh2011-07-151-19/+8
| | | | Change-Id: Ib14350364740efe5529fa9ee264c69f91c06a538
* VpnSettings: bind OnPreferenceClickListener later.Chia-chi Yeh2011-07-151-7/+4
| | | | | | Bug: 4999108 Change-Id: Idab3029a30943d1118584e6a1b01db96340858ed
* VpnSettings: enable MPPE by default.Chia-chi Yeh2011-07-141-1/+1
| | | | Change-Id: I0e8ec0ec4d233081d6b06d14f82e2c56d9ae0642
* VpnSettings: generate arguments for IPSec XAUTH VPNs.Chia-chi Yeh2011-07-141-11/+46
| | | | Change-Id: I70d5e93f0d431d9d6cc64324ce2c37129d1a2a88
* VpnSettings: pass certificates to racoon directly.Chia-chi Yeh2011-07-072-16/+47
| | | | | | Also fix some style issues. Change-Id: I7ca46d0cc3038f21ef5904d4515e90907a21d613
* VpnSettings: add status report.Chia-chi Yeh2011-07-041-28/+56
| | | | Change-Id: Ia050d997524b39868e6acce82d12b0415909ab77
* VpnSettings: rename some variables.Chia-chi Yeh2011-07-031-1/+1
| | | | Change-Id: I0550bebc55a42ad11768729d098ff5258442747e
* VpnSettings: hook up the legacy VPN with IConnectivityManager.Chia-chi Yeh2011-07-021-2/+12
| | | | | | The status report is not implemented yet. Change-Id: I266f840371e3698f779124d5e67bafe4d272cd94
* VpnSettings: IPSec Hybrid RSA does not need user certificate.Chia-chi Yeh2011-07-021-7/+6
| | | | | | Apparently I was confused... Change-Id: Ia4dc4b2399cffaf2e7a738b93212e821eb6d481d