Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,323 Commits 3 Branches 0 Tags
cc44ccf2f9e74d6c6138ee4b40ebffecfafde1cf
Commit Graph

250323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
cc44ccf2f9 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 10e29e0730  -s ours

* commit '10e29e0730c21cb8a2cfe74b43792fa3a5705195':
  Import translations. DO NOT MERGE

Change-Id: Ic4105391ce9541d9073b45d7c5d69b4e2f2bcae5
 2016-06-03 17:59:12 +00:00
Bill Yi
6c4a3962e7 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 93bc210b3f  -s ours

* commit '93bc210b3f9e9a86074080324162b3a66cac104c':
  Import translations. DO NOT MERGE

Change-Id: Ia8b0a47a38207e1d2c85f97f0e771281512d1e9c
 2016-06-03 17:59:06 +00:00
Eino-Ville Talvala
564dc9d0f7 Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 
am: cd44a32dfe

* commit 'cd44a32dfe6a5a39db496af6de7764e164cda6f5':
  Camera2: Update lensShadingMap documentation

Change-Id: If6a354fb827e650e97be7023ba9e44058a415b63
 2016-06-03 17:57:30 +00:00
TreeHugger Robot
10e29e0730 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:54:21 +00:00
TreeHugger Robot
93bc210b3f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:53:28 +00:00
Eino-Ville Talvala
cd44a32dfe Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 2016-06-03 17:51:19 +00:00
Sudheer Shanka
8ebc6e80b8 Merge "Avoid triggering support dialog in non-current user." into nyc-dev 
am: 5548733eb5

* commit '5548733eb5163ef9f3c642314d2d217503c90d64':
  Avoid triggering support dialog in non-current user.

Change-Id: I243f2699a5840294e0de9efc5e95011fd83dca37
 2016-06-03 17:13:03 +00:00
Bill Yi
81a108d038 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 237b52f40c  -s ours

* commit '237b52f40c5564a54a1073df6e77f6da93cdab12':
  Import translations. DO NOT MERGE

Change-Id: I6155b21e15e89da4d6a5234a89b7dac3ac005099
 2016-06-03 17:12:46 +00:00
Bill Yi
498f780f42 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 31cd8615b2  -s ours

* commit '31cd8615b2cd7cf04e00a87c7981264c1b180356':
  Import translations. DO NOT MERGE

Change-Id: I90116fb8e02a06ab13cb9c7169371f931fdea508
 2016-06-03 17:12:42 +00:00
Bill Yi
7d627e9cf0 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 52edfafb9c  -s ours

* commit '52edfafb9c53d14a5e1de1ecdd3d5b735cecf711':
  Import translations. DO NOT MERGE

Change-Id: I4ef01eea310877c5201b9c2e44c9f49948aeb1f1
 2016-06-03 17:12:38 +00:00
Bill Yi
c29b39b95f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f79616b427  -s ours

* commit 'f79616b4277f477985f96f8a486126a389905c7d':
  Import translations. DO NOT MERGE

Change-Id: Ia6869ed50d88aea53c3c42e02337eaecf1dd870f
 2016-06-03 17:12:33 +00:00
Bill Yi
5c2575071e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a68d1f10e2  -s ours

* commit 'a68d1f10e2c20e128215406b4d6f4fb835481324':
  Import translations. DO NOT MERGE

Change-Id: Ic08e6e8dcb28ab89c072abe20633c71d7695277e
 2016-06-03 17:04:14 +00:00
Bill Yi
bcd2ea35c0 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2130b28754  -s ours

* commit '2130b287549b010b405bc72d04f07fb1bd070ba5':
  Import translations. DO NOT MERGE

Change-Id: Ib9e163aa0e74fdd6c9b22c292e9651d153e117a4
 2016-06-03 17:04:08 +00:00
Bill Yi
f089201e2e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: ef2989920d  -s ours

* commit 'ef2989920d00f19d5dcd86bd521eec86bc058754':
  Import translations. DO NOT MERGE

Change-Id: I4c4da499fab8a30733235849a336876442e46125
 2016-06-03 17:04:02 +00:00
Bill Yi
67ae5a2251 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 3d9d9fa0d9  -s ours

* commit '3d9d9fa0d97974fc2dbd65ed1bd5b0995b3c347a':
  Import translations. DO NOT MERGE

Change-Id: I02a8d1407296ab018dab851a235fce0c8c75013c
 2016-06-03 17:03:59 +00:00
Bill Yi
479f70c516 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cace07e727  -s ours

* commit 'cace07e7271723232277e8dfe94799c80926c5ea':
  Import translations. DO NOT MERGE

Change-Id: I7b6473f40f64a17b4f7417cf28c1e24d36a9c3ff
 2016-06-03 17:03:50 +00:00
TreeHugger Robot
5548733eb5 Merge "Avoid triggering support dialog in non-current user." into nyc-dev 2016-06-03 17:02:53 +00:00
TreeHugger Robot
237b52f40c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 17:00:23 +00:00
TreeHugger Robot
31cd8615b2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:58:51 +00:00
TreeHugger Robot
52edfafb9c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:58:27 +00:00
TreeHugger Robot
f79616b427 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:57:50 +00:00
TreeHugger Robot
a68d1f10e2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:56:16 +00:00
TreeHugger Robot
2130b28754 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:58 +00:00
TreeHugger Robot
ef2989920d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:03 +00:00
TreeHugger Robot
3d9d9fa0d9 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:54:40 +00:00
TreeHugger Robot
cace07e727 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:53:13 +00:00
Bill Yi
686d0d7cf6 Import translations. DO NOT MERGE 
Change-Id: Ie630e761cacbec55840a3de9439aa36835a34b38
Auto-generated-cl: translation import
 2016-06-03 09:33:00 -07:00
Bill Yi
29e1099f93 Import translations. DO NOT MERGE 
Change-Id: I84e7cf1ca696555a2af6838dcae6a32df4503822
Auto-generated-cl: translation import
 2016-06-03 09:16:16 -07:00
Adrian Roos
50844bc504 Merge "Fix BigText transitions" into nyc-dev 
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
 2016-06-03 15:53:09 +00:00
TreeHugger Robot
2ab4f451dc Merge "Fix BigText transitions" into nyc-dev 2016-06-03 15:36:11 +00:00
Sudheer Shanka
54cb63c182 Avoid triggering support dialog in non-current user. 
Bug: 28953755
Change-Id: I3e23a003ec7c8c3d275fa09d6d58f59cc272f617
 2016-06-03 08:26:04 -07:00
Julia Reynolds
08cc30378c Don\'t leak guts. 
am: cdf98e1964

* commit 'cdf98e1964489916c68e240bd92c2e0bedab3c2d':
  Don't leak guts.

Change-Id: I4396a379812941015e8a8cdf4e9426f8503bce70
 2016-06-03 13:33:11 +00:00
Julia Reynolds
cdf98e1964 Don't leak guts. 
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes: 29064258
 2016-06-03 13:17:47 +00:00
Bill Yi
aff777e609 Import translations. DO NOT MERGE 
Change-Id: I2fd4e7683d9c10652bacfc820593e07bd58cefc0
Auto-generated-cl: translation import
 2016-06-03 06:04:14 -07:00
Bill Yi
b67c06c31a Import translations. DO NOT MERGE 
Change-Id: I733983cfcd864557c987aa746c3a3f2c249a9c12
Auto-generated-cl: translation import
 2016-06-03 05:23:35 -07:00
Bill Yi
2641c648f7 Import translations. DO NOT MERGE 
Change-Id: Ic52f441a17948a9d117126b1e808d05535cc558d
Auto-generated-cl: translation import
 2016-06-03 04:52:48 -07:00
Bill Yi
012e254040 Import translations. DO NOT MERGE 
Change-Id: I680d494c4670c1ae92902559bf88849f043ba501
Auto-generated-cl: translation import
 2016-06-03 04:38:00 -07:00
Bill Yi
ba14c03ddc Import translations. DO NOT MERGE 
Change-Id: I2bf24aac1ece07f78ad462b670824b85945b72f0
Auto-generated-cl: translation import
 2016-06-03 04:27:06 -07:00
Bill Yi
566cac1be3 Import translations. DO NOT MERGE 
Change-Id: I10d88a14b6477e7ba128653756a84c56ea5034c3
Auto-generated-cl: translation import
 2016-06-03 04:02:53 -07:00
Bill Yi
d5b0b73a51 Import translations. DO NOT MERGE 
Change-Id: Ifc14a8e231354fe8cbe65f22761236006de64ce5
Auto-generated-cl: translation import
 2016-06-03 03:46:06 -07:00
Tony Mak
fff6650de4 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN 
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
 2016-06-03 10:43:37 +00:00
Bill Yi
1a519c545e Import translations. DO NOT MERGE 
Change-Id: Ic23e11859d0b00fba56d8a3c93afbf86d139bcb4
Auto-generated-cl: translation import
 2016-06-03 03:38:40 -07:00
Tony Mak
33d03a9e43 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN 
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.

Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
   setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.

Bug: 29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
 2016-06-03 10:06:06 +00:00
Bill Yi
40b69850c5 Import translations. DO NOT MERGE 
Change-Id: I08aeb7a5fb63ed7d10a218d86365331c2ba02b4e
Auto-generated-cl: translation import
 2016-06-02 21:18:31 -07:00
Eric Schmidt
637ccf7585 Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 am: 76297d719d 
am: 9ad88ce3fe

* commit '9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6':
  docs: Fixed background optmizations code snippet

Change-Id: Ib5aeb12e19841f86c8d625d4ea2b1a3f0df4e766
 2016-06-03 03:06:49 +00:00
Eric Schmidt
9ad88ce3fe Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8 
am: 76297d719d

* commit '76297d719d5bbe2dcce65c357591c22b1a1d3293':
  docs: Fixed background optmizations code snippet

Change-Id: I66a1141d843dedb78b3abbbfa7820367779087b9
 2016-06-03 02:59:57 +00:00
Eric Schmidt
76297d719d Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs 
am: 0b8eb8c1e8

* commit '0b8eb8c1e833d3f16aaf6e44f256c23537ae0500':
  docs: Fixed background optmizations code snippet

Change-Id: I5fd02424afc2f99c7bd63f47e3cece88356546a1
 2016-06-03 02:52:51 +00:00
Eric Schmidt
0b8eb8c1e8 Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs 2016-06-03 02:41:46 +00:00
Andrii Kulian
8aadde745f Merge "Fix task selection logic" into nyc-dev 
am: 265bd89c3c

* commit '265bd89c3cb6f99d38d2f126a88c12fc6502431c':
  Fix task selection logic

Change-Id: If3b8b7d80885b7e5573b03f83f2cb31cfc0e6670
 2016-06-03 02:07:11 +00:00
Andrii Kulian
265bd89c3c Merge "Fix task selection logic" into nyc-dev 2016-06-03 01:37:52 +00:00