Commit Graph

301953 Commits

Author SHA1 Message Date
Narayan Kamath
c461181f87 Merge "Zygote : Block SIGCHLD during fork." 2016-11-08 09:38:18 +00:00
Bill Yi
6173104551 Import translations. DO NOT MERGE
Change-Id: I9d7b6d9dd8d752b25d78e5f3495a3dfd16e2bd5a
Auto-generated-cl: translation import
2016-11-08 01:16:54 -08:00
Bill Yi
6197c3f7d3 Import translations. DO NOT MERGE
Change-Id: I180b243c7e1bf346da977ae6a3aa711adf48ab3b
Auto-generated-cl: translation import
2016-11-08 00:50:25 -08:00
Bill Yi
fa4e7e368a Import translations. DO NOT MERGE
Change-Id: If794ddd0eceeadbb4c00523d2f48211222846252
Auto-generated-cl: translation import
2016-11-08 00:47:30 -08:00
TreeHugger Robot
f1cd7ce503 Merge "tv.cec: Update framework code to call Treble HAL" 2016-11-08 07:53:03 +00:00
Erik Kline
e452660466 Handle IpReachabilityMonitor errors better.
If construction of a new IpReachabilityMonitor throws an IAE then
log it and immediately call onProvisioningFailure().

Test: runtest frameworks-wifi
      passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()
      which fails with an NPE for unrelated reasons.

Bug: 31038971
Bug: 31742703
Change-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c
2016-11-08 16:02:24 +09:00
Donghyun Cho
bc6e372b25 tv.cec: Update framework code to call Treble HAL
Bug: 32073236
Test: Checked CEC features works on fugu after applying Treble HAL
Change-Id: I26df037594e2505bd8f2d2bb6222cba5ddca2906
2016-11-08 14:12:03 +09:00
Bill Yi
aa451616c8 Import translations. DO NOT MERGE
Change-Id: Icd8a71ffdf6db4fcfa0a001ffded8b51a729b10d
Auto-generated-cl: translation import
2016-11-07 20:59:23 -08:00
Daichi Hirono
3ff1c01cae Add AppFuseBridge class to the system service.
Bug: 29970149
Test: None
Change-Id: I1d40d8e3aec1c57a31d5ae66b33305990dc86b67
2016-11-08 13:19:00 +09:00
Michael Kwan
e88be615c1 Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev am: 4ad89bf51f am: bbc8d1d6ec
am: 0e9286ea1e

Change-Id: I5daef113542e6aa1ff000da475cd3dc6b5a82e0b
2016-11-08 03:54:54 +00:00
Michael Kwan
f027140fca Tweak AlertDialog and Preference layout for nonround watches. am: 6c8e3bb43d am: 177fe7ec1d
am: eaf4ca3ccf

Change-Id: Iacf4a4c7b0b1030e97684b8b6d2e7626f2ece201
2016-11-08 03:53:54 +00:00
Michael Kwan
0e9286ea1e Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev am: 4ad89bf51f
am: bbc8d1d6ec

Change-Id: I3f188f652c776c1b64803b1b93b4f6062e7941fe
2016-11-08 03:44:07 +00:00
Michael Kwan
eaf4ca3ccf Tweak AlertDialog and Preference layout for nonround watches. am: 6c8e3bb43d
am: 177fe7ec1d

Change-Id: I777c8626b900e6aa932516ed4b9d0ba16599f5ae
2016-11-08 03:42:57 +00:00
Michael Kwan
bbc8d1d6ec Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev
am: 4ad89bf51f

Change-Id: I3024ca375ebf077cba52696da7ac549bf0eff781
2016-11-08 03:31:58 +00:00
Michael Kwan
177fe7ec1d Tweak AlertDialog and Preference layout for nonround watches.
am: 6c8e3bb43d

Change-Id: I8403f321396198d1c8b481c920c52448f2c024d0
2016-11-08 03:31:55 +00:00
TreeHugger Robot
4ad89bf51f Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev 2016-11-08 03:21:14 +00:00
TreeHugger Robot
baca8f50df Merge "Don't call into ActivityManagerInternal outside system process." 2016-11-08 02:59:38 +00:00
TreeHugger Robot
2675e69e6e Merge "Add isChildDocument to MtpDocumentsProvider." 2016-11-08 02:33:59 +00:00
Manu Cornet
c6f261b750 Merge "2-dimensional Recents activity." 2016-11-08 02:24:42 +00:00
TreeHugger Robot
bf9aaddb14 Merge "Add new category for input setting and language setting" 2016-11-08 02:19:29 +00:00
Stephen Chen
0c56b3db64 Merge "Fix documentation for NetworkStatsManager methods." 2016-11-08 02:06:03 +00:00
Jason Monk
2dc804be11 Allow persistent changes to the vendor overlay theme
This allows the overlay being used to be changed without a new build
but still will require a reboot to take effect. Should no longer be
needed once hierarchical resources are in place, and can be removed.

Also fix check in fd_utils to point at correct location.

Test: Manual
Bug: 32721178
Change-Id: I2a63aea0c87791c8eb845d735cb1182716c8174d
2016-11-07 20:46:07 -05:00
Jeff Sharkey
17ea0b41d5 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8 am: a61e5fb9f6 am: e9cd3aea19 am: 557389d96b am: bd314fa444 am: 1563f499a1
am: 95a9156349

Change-Id: Iaf0d3f58f0474140353e2828de155e618b5cb36e
2016-11-08 01:32:13 +00:00
Jeff Sharkey
6f62df585f Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934 am: acdcb74361 am: 4ef12b0404 am: a8f9a6201b am: 57d21ef02a
am: 7279e0994d

Change-Id: I054675203f6ad7742d18cc5224a32cce8256205d
2016-11-08 01:24:30 +00:00
Garfield Tan
b44ae61e01 Add an extra to pass initial location URI for file choosers.
Test: It builds.

Bug: 30031881
Change-Id: I64e9392b0aec75baee13039642316f7e50494567
2016-11-07 17:22:57 -08:00
Jeff Sharkey
bb9947d2bf Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a am: 874a7af9f7 am: aaeb6286fe am: 4448f11e8a am: dd01f35677 am: 6a75cea1c6
am: 4cfebe845b

Change-Id: Id827fecdbf94af6d7bdd915d6c54e89c175234c3
2016-11-08 01:21:56 +00:00
Jeff Sharkey
95a9156349 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8 am: a61e5fb9f6 am: e9cd3aea19 am: 557389d96b am: bd314fa444
am: 1563f499a1

Change-Id: I4e69a65b1f6e8178fa970f2dee53520a3751dca1
2016-11-08 01:21:47 +00:00
TreeHugger Robot
e3d281ea18 Merge "Add debug memory tracking to SkiaGLPipeline" 2016-11-08 01:15:33 +00:00
Jeff Sharkey
7279e0994d Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934 am: acdcb74361 am: 4ef12b0404 am: a8f9a6201b
am: 57d21ef02a

Change-Id: I6edd0023d056bd64ae99c2536382e27218761146
2016-11-08 01:14:27 +00:00
Jeff Sharkey
b54e147041 Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc am: e4419f474e am: d93ed63baa am: a27ca045e5 am: a3d8d2e73e am: a5cdb7a19a
am: 3bed910d02

Change-Id: If584da3ff6eee4f26ef609565131165de8f2905c
2016-11-08 01:12:21 +00:00
Jeff Sharkey
4cfebe845b Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a am: 874a7af9f7 am: aaeb6286fe am: 4448f11e8a am: dd01f35677
am: 6a75cea1c6

Change-Id: I73f729a86343245f545ffb95686fe38c0d6af5ad
2016-11-08 01:12:18 +00:00
Jeff Sharkey
1563f499a1 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8 am: a61e5fb9f6 am: e9cd3aea19 am: 557389d96b
am: bd314fa444

Change-Id: Ib0f38618b7fa29de5279fc142ee616c96f2b1956
2016-11-08 01:12:13 +00:00
Jeff Sharkey
57d21ef02a Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934 am: acdcb74361 am: 4ef12b0404
am: a8f9a6201b

Change-Id: I5df11dfb82a5b10dd1a6154568d85c0d561f110f
2016-11-08 01:04:36 +00:00
Jeff Sharkey
3bed910d02 Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc am: e4419f474e am: d93ed63baa am: a27ca045e5 am: a3d8d2e73e
am: a5cdb7a19a

Change-Id: Iaccd37a844057eca463ae6cc0a4051b959aa965a
2016-11-08 01:02:18 +00:00
Jeff Sharkey
bd314fa444 Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8 am: a61e5fb9f6 am: e9cd3aea19
am: 557389d96b

Change-Id: I587ecb5f31246677c6e57814cb744ef2bb38572b
2016-11-08 01:02:12 +00:00
Jeff Sharkey
6a75cea1c6 Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a am: 874a7af9f7 am: aaeb6286fe am: 4448f11e8a
am: dd01f35677

Change-Id: Ie94abefc86a3f218c2aa1740f6ba2036a6a7e55e
2016-11-08 01:02:12 +00:00
Android Build Merger (Role)
f841c00b87 Merge "Public volumes belong to a single user. am: def2123f56 -s ours am: de221f06a3 am: 9854b1707c am: 5cae493d1b am: cf2d99289c am: ae7ff86216 am: 3c5d29c4cf" 2016-11-08 01:00:54 +00:00
Jeff Sharkey
82ecf9bb0a Public volumes belong to a single user. am: def2123f56 -s ours am: de221f06a3 am: 9854b1707c am: 5cae493d1b am: cf2d99289c am: ae7ff86216
am: 3c5d29c4cf

Change-Id: I16241d95a1ed8c4625d0e48473c96cef838b688c
2016-11-08 00:59:39 +00:00
Siyamed Sinir
9c3af5ab20 Merge "TextLine.handleRun should throw exception for invalid index" 2016-11-08 00:57:38 +00:00
Siyamed Sinir
9aba698bd1 Merge "StaticLayout visual fix for maxLines" 2016-11-08 00:56:18 +00:00
Jeff Sharkey
a8f9a6201b Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934 am: acdcb74361
am: 4ef12b0404

Change-Id: Ie986c43f72b3bc9140f23df71845fb2c0978c29e
2016-11-08 00:55:36 +00:00
Jeff Sharkey
dd01f35677 Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a am: 874a7af9f7 am: aaeb6286fe
am: 4448f11e8a

Change-Id: Ic5676d9bed87fa5777eee1ce578b6402d4274645
2016-11-08 00:53:15 +00:00
Jeff Sharkey
a5cdb7a19a Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc am: e4419f474e am: d93ed63baa am: a27ca045e5
am: a3d8d2e73e

Change-Id: I14455f72164933ce9cc2061fc3716a59566dae90
2016-11-08 00:52:41 +00:00
Jeff Sharkey
557389d96b Merge "Public volumes belong to a single user." into mnc-dr-dev am: b232177c61 am: 0a23c1a995 am: 09e10e54f8 am: a61e5fb9f6
am: e9cd3aea19

Change-Id: I3b61d8fa4e3ad2ba0ba99e6918ace3a5871e128e
2016-11-08 00:49:41 +00:00
Jeff Sharkey
4ef12b0404 Public volumes belong to a single user. am: 6b0079d3bc am: dc89fb9390 am: babd7e06d3 am: 8554f2d934
am: acdcb74361

Change-Id: I78abfa2adb14c2065117be41568d0fba90a277f7
2016-11-08 00:47:56 +00:00
Jeff Sharkey
3c5d29c4cf Public volumes belong to a single user. am: def2123f56 -s ours am: de221f06a3 am: 9854b1707c am: 5cae493d1b am: cf2d99289c
am: ae7ff86216

Change-Id: I99c391947f592b9829e66c341ca2409c3c207381
2016-11-08 00:47:48 +00:00
Jeff Sharkey
4448f11e8a Merge "Public volumes belong to a single user." into mnc-dev am: 34849c22e7 am: 60acc3e6ab am: 7738ebcd5c am: 8e803f734a am: 874a7af9f7
am: aaeb6286fe

Change-Id: I33a40f027ecbd233f7e8cafd61f50479ff565dd8
2016-11-08 00:42:43 +00:00
Jeff Sharkey
a3d8d2e73e Public volumes belong to a single user. am: 3a062a67fa am: e80720a731 am: 59bb608433 am: 84ef9e69fc am: e4419f474e am: d93ed63baa
am: a27ca045e5

Change-Id: Ie91c35c5b148e8d51dc54c398ce019e4f2046a31
2016-11-08 00:42:42 +00:00
Jeff Sharkey
ae7ff86216 Public volumes belong to a single user. am: def2123f56 -s ours am: de221f06a3 am: 9854b1707c am: 5cae493d1b
am: cf2d99289c

Change-Id: I2d0450c4d3aeb1250d0411fbe2083ed548cb4e35
2016-11-08 00:38:46 +00:00
Jeff Sharkey
bebb0843e2 Merge "Public volumes belong to a single user." into nyc-dev am: d537f76b88 am: 930e77314b am: 8c73d7989f am: 299aa88e26 am: 568e46ebe1
am: 473d807d05

Change-Id: I5c4997dec1b966afdaf7c5287a059e826b4da135
2016-11-08 00:38:42 +00:00