• Home
  • History
  • Annotate
  • only in /packages/apps/Settings/src/com/android/settings/vpn2/
History log of /packages/apps/Settings/src/com/android/settings/vpn2/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
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
pnSettings.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
pnSettings.java
c17bdbf849e45a6c445d0f4885b18ae9128487c9 12-Aug-2014 Adam Powell <adamp@google.com> Use material alert dialog item view layout

Bug 16552638

Change-Id: I6d0d5c2c3d8cc7064828d223134b020a3a0ca828
pnSettings.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
pnSettings.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
pnSettings.java
ee27b9de8f2ab17d50b90dd8c13546aebb4e9fc1 09-May-2014 Julia Reynolds <juliacr@google.com> Settings user restriction changes: wireless & networks changes.

Bug: 14081992
Change-Id: I32b0f06da7e7ff9bd8303ce26be2584e6cddbedc
pnSettings.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
pnSettings.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
pnSettings.java
8b78299d94ebb09fb9bf2bc7fb0015d2f1950839 21-Feb-2013 Jeff Sharkey <jsharkey@android.com> Improve notification UI for lockdown VPN.

Bug: 7064111
Change-Id: I951c1c116d2e0e22d1b32194d38f1431e806cbca
pnSettings.java
ca714d8d0c11c904b25bc20a0a9b2f2cc8d78ad5 14-Feb-2013 Kenny Root <kroot@google.com> KeyStore: stop using state()

Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
pnSettings.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
pnSettings.java
07d465ddb8629f128dde193d22de28cfd56663ca 24-Sep-2012 Jeff Sharkey <jsharkey@android.com> Hide lockdown VPN when IMS auth is required.

Bug: 7069782
Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
pnSettings.java
f5de1db28a61d159e62ef42f64a2cdcb316d0c2c 19-Sep-2012 Jeff Sharkey <jsharkey@android.com> Omit PPTP VPNs from lockdown list.

Bug: 7064069
Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9
pnSettings.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
pnSettings.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
pnSettings.java
c6e84c09590ec5e4da287fba32dd53775156ae76 20-Jul-2012 Jeff Sharkey <jsharkey@android.com> Migrate VpnProfile definition to framework.

Bug: 5756357
Change-Id: Icf4b2cb10e911216a2165f2afd1eb89152c5f1c0
pnDialog.java
pnProfile.java
pnSettings.java
b0b37ae21c172491bc170659b5f429601858ddc1 24-Apr-2012 Amith Yamasani <yamasani@google.com> Help menus for several screens.

Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
pnSettings.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
pnSettings.java
94cc1bbf3218a020548a90032ec34f608f4cefdb 01-Mar-2012 Chia-chi Yeh <chiachi@android.com> VpnSettings: show more error messages when VPN fails.

Bug: 6032883
Change-Id: Idc49e1b611fd0c01f199bfde984084a8e4c62e17
pnSettings.java
2340efc9a3fb4ae7b90cf9e7b3eab8c9ff7aeec8 16-Dec-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: use USER_PRIVATE_KEY to list user certificates.

Change-Id: Iba547331d00ddfe24dd5eda3a9ee70c9d17969d0
pnDialog.java
1cd0eba621e324585bfeffa7ca061b1f37db4873 07-Dec-2011 Chia-chi Yeh <chiachi@android.com> am 325c912a: Merge "VpnSettings: add support for server certificates." into ics-mr1

* commit '325c912ae64e9559cf2e84d5c94d81a0e8a15c48':
VpnSettings: add support for server certificates.
f5317a151bef8d93f7a640fe46c6dcde6baa258d 07-Dec-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: add support for server certificates.

Bug: 5714397
Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a
pnDialog.java
pnProfile.java
pnSettings.java
94c6cd6c29cb7cc92b4f5377db78df02c769f7c1 02-Nov-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: do not copy unsaved fields.

Bug: 5554228
Change-Id: I1f1d6d89f99c728e48e2abe00920a1f36bd53576
pnDialog.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
pnDialog.java
pnSettings.java
d5a5de4de6df9ebd979c11bbd1e850f787b3ffee 04-Aug-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: the field has been renamed.

Change-Id: I1e234e96d0fa4af6f03a5b902073460acffd8e28
pnSettings.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
pnDialog.java
pnSettings.java
aa5b531b0b540488f47ad0414dc77eecbb47cd3a 15-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: use the real passwords instead of dummy strings.

Change-Id: Ib14350364740efe5529fa9ee264c69f91c06a538
pnDialog.java
d501b5c963c0cbcc9c666f502229599464eaf3fd 15-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: bind OnPreferenceClickListener later.

Bug: 4999108

Change-Id: Idab3029a30943d1118584e6a1b01db96340858ed
pnSettings.java
0fe97ebcd86905829f6527d7198536d0423e1417 15-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: enable MPPE by default.

Change-Id: I0e8ec0ec4d233081d6b06d14f82e2c56d9ae0642
pnProfile.java
f35130dd79c100097025585c0b5a5ebbd38a414e 15-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: generate arguments for IPSec XAUTH VPNs.

Change-Id: I70d5e93f0d431d9d6cc64324ce2c37129d1a2a88
pnSettings.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
pnDialog.java
pnSettings.java
97fd85fd9776f3fb5c35217e82bcbcb5aea8416d 04-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: add status report.

Change-Id: Ia050d997524b39868e6acce82d12b0415909ab77
pnSettings.java
5c9e37c295a0219731882eca7a8805a08a439c34 03-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: rename some variables.

Change-Id: I0550bebc55a42ad11768729d098ff5258442747e
pnSettings.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
pnSettings.java
0082d17ce7ad2f8b3601068e62eda92aa8670a0f 03-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: IPSec Hybrid RSA does not need user certificate.

Apparently I was confused...

Change-Id: Ia4dc4b2399cffaf2e7a738b93212e821eb6d481d
pnDialog.java
2fa9eade41144094ef743cc5a3faf4f1ce7209af 01-Jul-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: rename some fields.

Change-Id: I999b773192d167f21c4a684c1864c37b9a433390
pnDialog.java
pnProfile.java
bbb5094be6673929bcb808cdeaf748a73be4dbf0 30-Jun-2011 Chia-chi Yeh <chiachi@android.com> VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs.

Change-Id: Ia58afa2f6f6d4b1b208bf6b893b8b7712154bdbf
pnDialog.java
pnSettings.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
pnDialog.java
pnProfile.java
pnSettings.java