drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
296,107 Commits 1 Branch 0 Tags
Commit Graph

130 Commits

Author SHA1 Message Date
Bill Yi
e646917820 Import translations. DO NOT MERGE 
Change-Id: Id8ff8c1f5bbcad70541c889d3f52e31f9b9a3e97
Auto-generated-cl: translation import
 2016-08-03 22:28:35 -07:00
Victor Chang
f1de8bb3c6 Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b am: d6d2497ebe 
am: 0075bf312c

* commit '0075bf312c34bc98c3dd26d8233d25bf753a3256':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: Ia65972e192adc0da0403bd0ff317da180c2432a0
 2016-05-31 10:12:13 +00:00
Victor Chang
0075bf312c Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b 
am: d6d2497ebe

* commit 'd6d2497ebe90e74f0ee7ddfdd2a00f4cb2f25dce':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: I7a44158b41c20d297e3e1c2869bb0a58549e84a2
 2016-05-31 09:59:59 +00:00
Victor Chang
d6d2497ebe Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev 
am: 98801e9f2b

* commit '98801e9f2bec03faf9be0c8bb961150004d309ff':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: If8de5a6c200953599bc3965da57b0de2b1dfb76e
 2016-05-31 09:51:44 +00:00
Victor Chang
aa2e02348a Finish ConfirmDialog when another vpn app is always-on 
Bug:29000925
Change-Id: I1087dbb2c366cebb4583ae0bb97302b3d2caf42c
 2016-05-31 09:11:19 +01:00
Robin Lee
d4f7655ccc Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 am: 8d27936438" into nyc-mr1-dev-plus-aosp 
am: 5af6e7d4b5

* commit '5af6e7d4b5301690c3cd9df7a713fd905270c7b1':
  Move VPN restriction check into setup dialog

Change-Id: I300b7bd3493106df90086ed88922b9806041da66
 2016-05-27 22:02:51 +00:00
Robin Lee
212083bd4f Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 
am: 8d27936438

* commit '8d2793643843471a23ebad38acb4ef1f544ecb98':
  Move VPN restriction check into setup dialog

Change-Id: I4beb9edb0ec4631cef969250e36083a518e2d9b7
 2016-05-27 03:50:50 +00:00
Robin Lee
8d27936438 Merge "Move VPN restriction check into setup dialog" into nyc-dev 
am: 32ceb9c801

* commit '32ceb9c801a86f901ec8230eec301c30e1deff3b':
  Move VPN restriction check into setup dialog

Change-Id: I214e3196b6aca565ff0f45bbca1f92d6d97fc4d2
 2016-05-27 03:31:34 +00:00
Robin Lee
32ceb9c801 Merge "Move VPN restriction check into setup dialog" into nyc-dev 2016-05-26 23:41:28 +00:00
Bill Yi
ce87380e94 Import translations. DO NOT MERGE 
Change-Id: I99ec726f06d409ab5ae67e6dee93d642e7c33988
Auto-generated-cl: translation import
 2016-05-23 00:21:46 -07:00
Baligh Uddin
df75e04987 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28857042
Change-Id: If505e78ba6d78210fb4eba0ac8a57df26e860d03
 2016-05-21 19:12:53 -07:00
Robin Lee
628ae0d841 Move VPN restriction check into setup dialog 
The purpose of DISALLOW_CONFIG_VPN is to stop users from configuring
VPN, not from using it at all.

The key difference being that if the admin already enforced a VPN then
that setting should be respected (but it still shouldn't be tamperable).

Bug: 28733079
Change-Id: Ib8cab5657a9d5819a019093da3812cd8c2ca4050
 2016-05-20 14:53:48 +01:00
Baligh Uddin
a0ca7dc84f Import translations. DO NOT MERGE 
Change-Id: Icb3846edf5852539dce90bcbb25b0ff0c0da92ef
Auto-generated-cl: translation import
 2016-05-16 13:42:55 -07:00
Alan Viverette
ced556e7e6 Merge "Remove DayNight theme" into nyc-dev am: b4e7b54 
am: 1f890d3

* commit '1f890d325399fb43c08437beddf0533618d11f87':
  Remove DayNight theme

Change-Id: I751f5993fdfd50c53feb6c0ab76a57ddd0549b89
 2016-03-31 21:14:49 +00:00
Alan Viverette
1f890d3253 Merge "Remove DayNight theme" into nyc-dev 
am: b4e7b54

* commit 'b4e7b545a284fce4e863b7c6ed2018a265ec3bb2':
  Remove DayNight theme

Change-Id: If569b172dadf5e4df64dde756d35c471f20e8469
 2016-03-31 21:11:34 +00:00
Alan Viverette
ae4908f41c Remove DayNight theme 
Bug: 21854466
Change-Id: I739872112d0ae457d0d4620f9222206072d54b4b
 2016-03-31 16:18:27 -04:00
Geoff Mendal
e47e9f9bfe Import translations. DO NOT MERGE 
Change-Id: Ice7205483f63dff37b1e77506586f1a71938f9a9
Auto-generated-cl: translation import
 2016-03-19 14:30:20 +05:30
Geoff Mendal
bd4e1982b6 Import translations. DO NOT MERGE 
Change-Id: I296c68fb07831a3f96c10cbfe0af4a076c14c57f
Auto-generated-cl: translation import
 2016-03-18 20:51:43 -07:00
Geoff Mendal
9e4b372047 Import translations. DO NOT MERGE 
Change-Id: Iaf97244c9605a29255f2f861cde66b02e016c9b3
Auto-generated-cl: translation import
 2016-02-22 06:06:46 -08:00
Geoff Mendal
40cd88b50f Import translations. DO NOT MERGE 
Change-Id: I0301b5dae0d952d8db0066ec46822a831d67dc47
Auto-generated-cl: translation import
 2016-02-15 06:09:29 -08:00
Geoff Mendal
b5622cb552 Import translations. DO NOT MERGE 
Change-Id: Id4838bd0f2d05518f51db27a1a523501b579c1c5
Auto-generated-cl: translation import
 2016-01-18 06:12:17 -08:00
Geoff Mendal
df68dfdd53 Import translations. DO NOT MERGE 
Change-Id: I5470c5cea8ef18eed3baf21e7742d384e50bfed8
Auto-generated-cl: translation import
 2015-12-16 06:06:08 -08:00
Robin Lee
c2c2e3eeb9 Create Vpn ManageDialog in onCreate, not onResume 
Bug: 25786112
Change-Id: I3dc2ccdce4cc9b449968ab59d1e1d0ff0476ecec
 2015-12-02 16:17:58 +00:00
Geoff Mendal
530db1eb98 Import translations. DO NOT MERGE 
Change-Id: Ie70cf29b4a04891f28aa117c96b2dce917cebceb
Auto-generated-cl: translation import
 2015-11-09 05:58:55 -08:00
Fyodor Kupolov
ca8594a341 Moved alert setup code to onCreate 
setupAlert() was called multiple times and this was causing an error.

Bug: 24412662
Change-Id: I5ff91f9f65d3298fc3b6996e147e3133c0bea882
 2015-10-02 16:13:05 -07:00
Baligh Uddin
d6c207aee6 Import translations. DO NOT MERGE 
Change-Id: Ie3a21768b28e768bded737f757fe51f1f5675595
Auto-generated-cl: translation import
 2015-09-10 12:46:09 -07:00
Geoff Mendal
91d52f6927 Import translations. DO NOT MERGE 
Change-Id: Id242387025c7713edb1bdb14153e1e51e838334c
Auto-generated-cl: translation import
 2015-07-22 05:55:08 -07:00
Robin Lee
a6519cc665 am eda6e728: am e211fc40: am 515a8406: am 59ca7dd0: am 846362fa: Merge "Use \'dp\' paddings instead of \'mm\' for VPN dialogs" into mnc-dev 
* commit 'eda6e728175ed53059a055211efea455f9770204':
  Use 'dp' paddings instead of 'mm' for VPN dialogs
 2015-07-08 02:04:43 +00:00
Robin Lee
e211fc4027 am 515a8406: am 59ca7dd0: am 846362fa: Merge "Use \'dp\' paddings instead of \'mm\' for VPN dialogs" into mnc-dev 
* commit '515a8406aa649fb5ea63a79f697eb04afadf4a3d':
  Use 'dp' paddings instead of 'mm' for VPN dialogs
 2015-07-07 23:56:47 +00:00
Robin Lee
5f95520cfd Use 'dp' paddings instead of 'mm' for VPN dialogs 
The values had gradually shifted away from what they need to be to
line up with other UI elements (ie. title bar)

Bug: 22314161
Change-Id: I03fd15632db02b723348e42066f9e45158eae148
 2015-07-07 09:26:24 -07:00
Alan Viverette
afc21d72d8 am f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev 
* commit 'f1da9a1401fe1304bee8a550a0141c79ecc3c0b3':
  DO NOT MERGE: Remove DayNight theme
 2015-06-18 22:31:41 +00:00
Alan Viverette
15d48a16f6 DO NOT MERGE: Remove DayNight theme 
Do not go gentle into that good night,
Old age should burn and rave at close of day;
Rage, rage against the dying of the light.

Though wise men at their end know dark is right,
Because their words had forked no lightning they
Do not go gentle into that good night.

Bug: 21854466
Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
 2015-06-18 15:15:16 -07:00
Geoff Mendal
24be493039 Import translations. DO NOT MERGE 
Change-Id: I600637b0abc1f3de8f2156137b216b2d271cd575
Auto-generated-cl: translation import
 2015-05-30 17:58:43 -05:00
Geoff Mendal
733eae45fb Import translations. DO NOT MERGE 
Change-Id: Iee3d801255d38c5e864dcb066680999548fea217
Auto-generated-cl: translation import
 2015-05-29 21:31:39 -07:00
Geoff Mendal
c8bcef82a6 Import translations. DO NOT MERGE 
Change-Id: I29ce21fa1ae95e89e463f2ef515fc94416e54455
Auto-generated-cl: translation import
 2015-05-21 05:33:22 -07:00
Robin Lee
3b3dd942ec Support cross-user VPN calls (with permission) 
Settings and SystemUI need to act on other users than USER_OWNER.

This is gated by INTERACT_ACROSS_USERS_FULL in addition to the existing
CONTROL_VPN checks, so the number of processes able to interfere with
other profiles' VPNs should be quite small.

Bug: 20692490
Bug: 20747154
Bug: 20872408
Change-Id: I6e5d7220f73435bec350719e7b4715935caf4e19
 2015-05-18 23:35:31 +01:00
Alan Viverette
b9da280ac2 DayNight theme for framework packages 
Change-Id: I745f90561c957c83540e75a2886e294633c83be1
 2015-05-05 14:09:21 -07:00
Geoff Mendal
37b4c7989d Import translations. DO NOT MERGE 
Change-Id: I72c5378c90345a929c525db99e47abd0c67fdb2f
Auto-generated-cl: translation import
 2015-04-22 06:05:01 -07:00
Geoff Mendal
3997c05782 Import translations. DO NOT MERGE 
Change-Id: Ia2267065864b0a7ff750e2956f0bab7507b8c32c
Auto-generated-cl: translation import
 2015-03-20 23:56:54 -07:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
Geoff Mendal
3fb2f6594e Import translations. DO NOT MERGE 
Change-Id: I6f5eaee0cfc5d0fd3995c600fb5eaf0afa032d4d
Auto-generated-cl: translation import
 2015-01-21 07:19:12 -08:00
Geoff Mendal
01d33e5cf2 Import translations. DO NOT MERGE 
Change-Id: I8aed2731e04350bbf8c50de7ebc81f9aaddf8fee
Auto-generated-cl: translation import
 2015-01-05 06:32:26 -08:00
Baligh Uddin
43b6ce7622 Import translations. DO NOT MERGE 
Change-Id: I1506acd4f2df7bda4a8d4fb968b5e9e316326ec6
Auto-generated-cl: translation import
 2014-12-23 00:23:42 -08:00
Jeff Davidson
c79924f741 am b431a198: am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 
* commit 'b431a198ec255be7efb30b4c81a779a4eb5009f6':
  Enforce VPN control "permission" with an actual permission.
 2014-11-18 02:30:54 +00:00
Jeff Davidson
b431a198ec am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 
* commit 'e6bc5adf2d4639b63001a5889ad301bae47bcd7f':
  Enforce VPN control "permission" with an actual permission.
 2014-11-18 02:05:21 +00:00
Geoff Mendal
6b4b851c38 Import translations. DO NOT MERGE 
Change-Id: Ia455f5ceec1e3c7d2c646e0f2ff252683ec46201
Auto-generated-cl: translation import
 2014-11-17 13:02:56 -08:00
Geoff Mendal
610383563e Import translations. DO NOT MERGE 
Change-Id: If9cd12a06876011fcb55612cedaa24d9e1b945ff
Auto-generated-cl: translation import
 2014-11-12 23:16:17 -08:00
Jeff Davidson
bc19c181c8 Enforce VPN control "permission" with an actual permission. 
The current implementation uses a whitelist of package names. Use a
system|signature permission instead of rolling our own security and
add that permission to the existing set of whitelisted packages
(SystemUI and VpnDialogs).

In addition to being less of a security risk (using well-known methods
like Context.enforceCallingPermission rather than manually querying
PackageManager and checking UIDs for package names), this enables
other system-privileged apps to control VPN as needed per the below
bug.

Bug: 18327583
Change-Id: I38617965c40d62cf1ac28e3cb382c0877fb1275d
 2014-11-12 08:56:20 -08:00
Geoff Mendal
2e8f2b5b05 Import translations. DO NOT MERGE 
Change-Id: Ied3684129384c44a0f9c374c4b1c4f22191a3f33
Auto-generated-cl: translation import
 2014-11-10 09:03:45 -08:00
Baligh Uddin
03e554b4f1 Import translations. DO NOT MERGE 
Change-Id: Iaaa6b27c60a7641bc236b062976f1b4ffd9e55d5
Auto-generated-cl: translation import
 2014-11-07 01:40:15 -08:00