Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b51541753a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:53:48 +00:00
TreeHugger Robot
4233404ee4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:53:29 +00:00
TreeHugger Robot
cace07e727 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:53:13 +00:00
Bill Yi
4535c0f80c Import translations. DO NOT MERGE 
Change-Id: Id381d85225a2de4b0e0c1f2d3fba40143ed738a2
Auto-generated-cl: translation import
 2016-06-03 09:43:50 -07:00
Robert Greenwalt
6a5c9560a3 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev 2016-06-03 16:38:58 +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
df4b7bcafa Import translations. DO NOT MERGE 
Change-Id: I046db29b7718914aaab4d40f7dc1aa284255198a
Auto-generated-cl: translation import
 2016-06-03 09:27:25 -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
Victor Chang
b04a5eab84 Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on 
Cause: It revoked the user consent of the vpn app without reseting always-on vpn.
In addition, prepareVpn sets legacy vpn as the current package, the state in
Vpn.class is broken, as it thought the current always-on package is legacy vpn,
(mAlwaysOn is only for app vpn, not for legacy vpn). As a result, prepareVpn rejects
all VpnService.prepare.

Bug: 29031820
Change-Id: Id6bf1d6f38cf134a872811806301b8a602fb5725
 2016-06-03 17:14:32 +01:00
Adrian Roos
d49a86ceda Merge "Fix BigText transitions" into nyc-dev 
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: I4705bacc68842c2a7ed178689e8efa53abc8e235
 2016-06-03 15:53:07 +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
Makoto Onuki
37087ad710 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 2016-06-03 15:21:45 +00:00
Julia Reynolds
0853233433 Don\'t leak guts. 
am: cdf98e1964

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

Change-Id: Id7e53a4e108280c8b843413fa377ae40ea0acb2e
 2016-06-03 13:33:08 +00:00
Julia Reynolds
cdf98e1964 Don't leak guts. 
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes: 29064258
 2016-06-03 13:17:47 +00:00
Bill Yi
147c6d75d8 Import translations. DO NOT MERGE 
Change-Id: I2e818cdd84923a3b9cda7d4954ba5f492a9817f4
Auto-generated-cl: translation import
 2016-06-03 06:09:07 -07: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
e3a9c58c32 Import translations. DO NOT MERGE 
Change-Id: I46dc39205d2e1652f96638ed246431742c63f93e
Auto-generated-cl: translation import
 2016-06-03 06:01:48 -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
4ae6354467 Import translations. DO NOT MERGE 
Change-Id: I53789d03049f5647fff50cf5521b461bf5481afd
Auto-generated-cl: translation import
 2016-06-03 04:57: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
69e29c77b8 Import translations. DO NOT MERGE 
Change-Id: Ibee7d58074781c85c28496af8ad0702b51fd85a8
Auto-generated-cl: translation import
 2016-06-03 04:50:16 -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
0fbac210a7 Import translations. DO NOT MERGE 
Change-Id: I5ad391c3e1b05ca8363ffca2837860946cd4570f
Auto-generated-cl: translation import
 2016-06-03 04:31:48 -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
3be3f6cc5e Import translations. DO NOT MERGE 
Change-Id: I1af602c8252ce1006e26a8f965fe56e976fe3439
Auto-generated-cl: translation import
 2016-06-03 04:11:55 -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
dd92cc5dbe Import translations. DO NOT MERGE 
Change-Id: Ia658676186e563e8e1e83c273fd76c011b9169ef
Auto-generated-cl: translation import
 2016-06-03 03:57:53 -07:00
Bill Yi
f794288a3e Import translations. DO NOT MERGE 
Change-Id: I1e9706b340786d79d7a9cdc4735137d3fcf2e840
Auto-generated-cl: translation import
 2016-06-03 03:51:12 -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
d73c6eb6f3 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: I2de02ec6febdc58ff9a79562059cc11e7d617be5
 2016-06-03 10:43:30 +00:00
Bill Yi
da085a46a0 Import translations. DO NOT MERGE 
Change-Id: Ib9d08e1380ee7258fc8a760cf82a10862b35ac84
Auto-generated-cl: translation import
 2016-06-03 03:43:29 -07: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
Bill Yi
a5c543bf35 Import translations. DO NOT MERGE 
Change-Id: Iec10d485540939eca94ecf3d013cb7a9cda8c4f2
Auto-generated-cl: translation import
 2016-06-03 03:36:04 -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
46a51cb108 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: I1a68f03403c34993525487f604422367f35fc0a0
 2016-06-03 03:06:44 +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
f4b91fe3e1 Merge "Fix task selection logic" into nyc-dev 
am: 265bd89c3c

* commit '265bd89c3cb6f99d38d2f126a88c12fc6502431c':
  Fix task selection logic

Change-Id: Ic80d782ca53d8cf7a565a9337a686441edbd2c72
 2016-06-03 02:07:04 +00:00
Andrii Kulian
265bd89c3c Merge "Fix task selection logic" into nyc-dev 2016-06-03 01:37:52 +00:00
Zhijun He
e8526a0105 Merge "Camera2: add deferred output config support" into nyc-mr1-dev 2016-06-03 01:14:00 +00:00
Pavlin Radoslavov
fa790104f2 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 
am: 0bc61eb176

* commit '0bc61eb176644e243b0e131a29a5f66a4303d9b0':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: Ia2aed3304039a672961608fc900ab8996f67d716
 2016-06-03 01:00:35 +00:00
Pankaj Kanwar
0bc61eb176 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 2016-06-03 00:55:50 +00:00
Sanket Padawe
1a6b6fc266 Merge "Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d" into nyc-mr1-dev 2016-06-03 00:34:03 +00:00
TreeHugger Robot
7d64d64269 Merge "Round icons" into nyc-mr1-dev 2016-06-03 00:32:35 +00:00
Adam Lesinski
c878fb0cb8 Merge "Allow uses-library under <application>" into nyc-mr1-dev 2016-06-03 00:31:37 +00:00
Zhijun He
c8b181e95d Camera2: add deferred output config support 
Allow surfaces to be deferred during session creation. Once the surfaces are ready,
the application can finish the deferred output configuration to be able to submit
requests with these surface targets.

Bug: 28323863
Change-Id: Id6634c3ef2ecc84422a88f63de0a19a0cb496e96
 2016-06-02 17:30:20 -07:00
Sanket Padawe
a7f74b1d43 Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d 
Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968
 2016-06-02 17:20:08 -07:00