tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23374 commits 1 branch 0 tags 215 MiB
Commit graph

23374 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Cherry
39b1d2043e Merge \\"init: expand arguments of services when they start\\" am: 86cd314af3 
am: f6ee6e16d9

Change-Id: I995a23e3eaa19bca1c4dc7880d786b806bd53306
 2016-06-08 22:55:40 +00:00
Tom Cherry
f6ee6e16d9 Merge \"init: expand arguments of services when they start\" 
am: 86cd314af3

Change-Id: I1c6945f6bff4756a67557aecf8a1d1c7ad6f916d
 2016-06-08 22:52:42 +00:00
Tom Cherry
86cd314af3 Merge "init: expand arguments of services when they start" 2016-06-08 22:42:11 +00:00
Vitalii Tomkiv
69cfeabfc0 Merge \\"Add process priority to service definition.\\" am: 14b00baaae 
am: 20cc2787cb

Change-Id: I12993eed4953a7bdd832de0c263ce8d4c2476969
 2016-06-08 21:42:31 +00:00
Vitalii Tomkiv
20cc2787cb Merge \"Add process priority to service definition.\" 
am: 14b00baaae

Change-Id: I0b5cfdce32afdbc47c10a8df015671de1bcb6ada
 2016-06-08 21:39:44 +00:00
Vitalii Tomkiv
14b00baaae Merge "Add process priority to service definition." 2016-06-08 21:33:40 +00:00
Vitalii Tomkiv
081705c258 Add process priority to service definition. 
This change allows to set prioirrity of the process to be set through
*.rc file.

Bug: 28866384
Change-Id: If0108ef05c8a151749c43d2d7de1187653255ce8
 2016-06-08 13:22:14 -07:00
Elliott Hughes
e4e6864e72 Merge \\"Set file capabilities on adb sync/push.\\" am: a500cf9cdf 
am: 4e4a274e96

Change-Id: Ife5e12dcbf019d740ac642adf25aec75c006b2c8
 2016-06-08 17:26:17 +00:00
Elliott Hughes
4e4a274e96 Merge \"Set file capabilities on adb sync/push.\" 
am: a500cf9cdf

Change-Id: I07232bd6f7f01daa44a2d8d30efdadce1e6af67c
 2016-06-08 17:23:53 +00:00
Treehugger Robot
a500cf9cdf Merge "Set file capabilities on adb sync/push." 2016-06-08 17:19:41 +00:00
Elliott Hughes
06d1f79900 Allow multiple (sequential) adb users on Linux. 
am: 75f42d7ea7

Change-Id: I96b6be90f3ea7851baa22c0d21e60c45b48320ce
 2016-06-08 17:09:06 +00:00
Elliott Hughes
32c60b4ced Set file capabilities on adb sync/push. 
Bug: http://b/29180022
Change-Id: Ia21ebf0972af41b0a3becc1189ed836fd74ae5c8
 2016-06-08 09:16:28 -07:00
Elliott Hughes
75f42d7ea7 Allow multiple (sequential) adb users on Linux. 
Before this, adb will fail to start for the second user who tries because
/tmp/adb.log already exists and isn't writable by the second user.

Also allow $TMPDIR to override the use of /tmp.

Bug: http://b/29201686
Bug: https://code.google.com/p/android/issues/detail?id=211420

(cherry picked from commit d89a6c2285)

Change-Id: Ibb1369e8043feb9774593e317dcd7bb93323fd89
 2016-06-08 08:36:19 -07:00
Elliott Hughes
fff3e52617 Merge \\"Allow multiple (sequential) adb users on Linux.\\" am: 6bf8d26c82 
am: b227e61c41

Change-Id: Ibed97f2d5ac4ae9c307871cc516a81c2eb761bcd
 2016-06-08 14:36:36 +00:00
Elliott Hughes
b227e61c41 Merge \"Allow multiple (sequential) adb users on Linux.\" 
am: 6bf8d26c82

Change-Id: I76e75478b738a2452db33faa4ab68844acb9415a
 2016-06-08 14:32:52 +00:00
Elliott Hughes
6bf8d26c82 Merge "Allow multiple (sequential) adb users on Linux." 2016-06-08 14:24:59 +00:00
Elliott Hughes
d89a6c2285 Allow multiple (sequential) adb users on Linux. 
Before this, adb will fail to start for the second user who tries because
/tmp/adb.log already exists and isn't writable by the second user.

Also allow $TMPDIR to override the use of /tmp.

Bug: https://code.google.com/p/android/issues/detail?id=211420
Change-Id: Ic53da981ac0fa45bfed62e7b351d75dca0540235
 2016-06-07 14:53:21 -07:00
Mattias Nissler
725ca56851 Merge "fs_mgr: Remove incorrect free() on error paths in load_key()" am: 35d84096e9 
am: 6f29ec0197

* commit '6f29ec0197a1b146d302b3e158c258bfef4566f7':
  fs_mgr: Remove incorrect free() on error paths in load_key()

Change-Id: Ic01cbaf499e494f4edcc3e4261139d2b365d3a59
 2016-06-07 21:15:08 +00:00
Mattias Nissler
6f29ec0197 Merge "fs_mgr: Remove incorrect free() on error paths in load_key()" 
am: 35d84096e9

* commit '35d84096e9a53c2d38de92de99271a8a772c186d':
  fs_mgr: Remove incorrect free() on error paths in load_key()

Change-Id: I034339af90249da14ae0ea50f662563fa66f8221
 2016-06-07 21:12:39 +00:00
Mattias Nissler
35d84096e9 Merge "fs_mgr: Remove incorrect free() on error paths in load_key()" 2016-06-07 21:00:03 +00:00
Dmitry Shmidt
f434f87130 Merge "libnetutils: Add synchronization per socket full operation" am: 04045fd4d1 
am: 776e6bb856

* commit '776e6bb856d451816d6d1b7303f3127fed3c1313':
  libnetutils: Add synchronization per socket full operation

Change-Id: I4dcc6524f3fb722d353838c6709d3ea4e8d4531b
 2016-06-07 20:44:38 +00:00
Mark Salyzyn
5e2beeb8da Manually fix automerger error on 4ab7548 
am: a6f1c46fa0

* commit 'a6f1c46fa04cf6b35b77bf249af11a3ffbe562e3':
  init: Add support for ${x.y:-default} expansion

Change-Id: If03b9453ed461e5878ecefc8863b164a683c10a4
 2016-06-07 20:42:24 +00:00
Dmitry Shmidt
776e6bb856 Merge "libnetutils: Add synchronization per socket full operation" 
am: 04045fd4d1

* commit '04045fd4d144c8282c58e00571a708d39ba44081':
  libnetutils: Add synchronization per socket full operation

Change-Id: Ide321623e3135aab097a70ba95b5d6c8f1c0bb71
 2016-06-07 20:42:13 +00:00
The Android Automerger
a6f1c46fa0 Manually fix automerger error on 4ab7548 
* commit '4ab7548':
  init: Add support for ${x.y:-default} expansion
 2016-06-07 20:39:36 +00:00
Treehugger Robot
04045fd4d1 Merge "libnetutils: Add synchronization per socket full operation" 2016-06-07 19:13:48 +00:00
Treehugger Robot
4ab7548406 Merge "init: Add support for ${x.y:-default} expansion" 2016-06-07 19:03:41 +00:00
Tom Cherry
bac3536cc9 init: expand arguments of services when they start 
Arguments of commands are expanded based on properties if they contain
${property.name}, however this is not currently done for arguments of
services.

This patch makes it that arguments of services are expanded each time
that the service starts at the point immediately before execve().

Change-Id: Iba581a8377e25a6478d4d2ec2e8b29e181d8640c
 2016-06-07 11:22:00 -07:00
Mark Salyzyn
4b56162a33 init: Add support for ${x.y:-default} expansion 
commit 00ede7d262 (init: do
expand_props before calling the builtins) broke logpersist

Bug: 28120456
Bug: 22654233
Change-Id: Ib4d8231665b26ac083b02243177493fab41c8978
 2016-06-07 18:09:17 +00:00
Dmitry Shmidt
4f831e2cfb libnetutils: Add synchronization per socket full operation 
Take and release mutex between ifc_init() and ifc_close()
calls to prevent global ifc_ctl_sock override.

Bug: 22307208

(cherry-pick of cebcd450c6ca3de5106ef3d817d5b760f5d57fbe.)

Change-Id: Iacffd329ce2a51defa550c7e33277332045a7b9b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2016-06-07 10:11:59 -07:00
Chuanxiao Dong
aa0318c9e9 Merge "fs_mgr: fix encryptable=footer support" am: b67fed557f 
am: 7f06a23414

* commit '7f06a234140a1dc5c0160fca03b7fcf0fd35939a':
  fs_mgr: fix encryptable=footer support

Change-Id: Iea56bd3856a241100bd23b3a06c3284c47bff5c0
 2016-06-07 17:00:16 +00:00
Chuanxiao Dong
7f06a23414 Merge "fs_mgr: fix encryptable=footer support" 
am: b67fed557f

* commit 'b67fed557f68714ba602ecbf3b4fa8bd06faf831':
  fs_mgr: fix encryptable=footer support

Change-Id: I4112bdfff301ffbcf172031a312cab9278b6ace4
 2016-06-07 16:54:42 +00:00
Treehugger Robot
b67fed557f Merge "fs_mgr: fix encryptable=footer support" 2016-06-07 16:49:39 +00:00
Elliott Hughes
016ad16100 Merge "Use alignas for alignment." am: bb1e7977fb 
am: 689b998ab2

* commit '689b998ab26f2a04e079312aee2f8e32fbe7f26c':
  Use alignas for alignment.

Change-Id: Ic81a88146df0f407849800c63d2edb7404efe0ac
 2016-06-07 15:55:12 +00:00
Elliott Hughes
689b998ab2 Merge "Use alignas for alignment." 
am: bb1e7977fb

* commit 'bb1e7977fbd4b0f156d40f78695e2ff53db200a1':
  Use alignas for alignment.

Change-Id: I49592b6c75825b9e094fa6755bb0ce281a30135c
 2016-06-07 15:47:02 +00:00
Elliott Hughes
bb1e7977fb Merge "Use alignas for alignment." 2016-06-07 15:41:28 +00:00
Mattias Nissler
31404e58e9 fs_mgr: Remove incorrect free() on error paths in load_key() 
This fixes a bug introduced by
https://android-review.googlesource.com/#/c/212781/ which would make
fs_mgr crash when hitting one of the error paths.

Bug: 28585197
Change-Id: I40e6612e2eb3e6f584e70c608afc6d4378d73c4f
 2016-06-07 16:37:48 +02:00
Sami Tolvanen
4171b2b724 resolve merge conflicts of eacbb82 to nyc-dev-plus-aosp 
Change-Id: Ia3077f826c1d422932b62684ae0d53935abfe807
 2016-06-06 22:56:23 -07:00
Elliott Hughes
20352727af Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 2016-06-07 04:40:43 +00:00
Elliott Hughes
8d532e4737 resolve merge conflicts of cea1d04 to nyc-dev-plus-aosp 
Change-Id: I41cdca717664a16f00fd1b28076dd752fa96653d
 2016-06-06 21:19:55 -07:00
Collin Mulliner
cea1d0465b Merge "use process groups for processes started by init" 
am: ebe636e5ce

* commit 'ebe636e5ce57df4fd8a93304453a3de30b758104':
  use process groups for processes started by init

Change-Id: Id0368160918e80ce02c152ee96d71b2e77c542e7
 2016-06-07 03:06:52 +00:00
Elliott Hughes
ebe636e5ce Merge "use process groups for processes started by init" 2016-06-07 03:03:07 +00:00
Elliott Hughes
5f4a946c09 Use alignas for alignment. 
Change-Id: I427c407a188682a360c74b2bd5a44dd62551ea66
 2016-06-06 19:59:45 -07:00
Sami Tolvanen
eacbb824c9 Merge "fs_mgr: validate corrected signatures" into nyc-dev 2016-06-07 00:01:56 +00:00
David Pursell
20fd80d0e6 resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp 
Change-Id: I7bf63eae8c13ffd512483e940bb5c35e8ce4e36e
 2016-06-06 16:51:08 -07:00
Collin Mulliner
f7e79b99c1 use process groups for processes started by init 
Put every service into a process group, kill the process group
and all child processes created within the group when killing the
service. Removed libutil dependency in libprocessgroup.

Bug: 25355957
Change-Id: Ieed60ec41579f638ab9b1e66a7e6330ed578ab05
Signed-off-by: Collin Mulliner <collinrm@squareup.com>
 2016-06-06 16:31:01 -07:00
David Pursell
27a68ef007 Merge "adbd: properly close subprocess pipes on Ctrl+C." am: 605628d325 
am: 5701c58296

* commit '5701c58296b7ae84e8b9e67b6103ffdf63550fc7':
  adbd: properly close subprocess pipes on Ctrl+C.

Change-Id: I361b9ed8ce1d12487d88850635bf1b60c1b675c4
 2016-06-06 21:25:03 +00:00
David Pursell
5701c58296 Merge "adbd: properly close subprocess pipes on Ctrl+C." 
am: 605628d325

* commit '605628d325b003251155b5c5b425028106bf8f29':
  adbd: properly close subprocess pipes on Ctrl+C.

Change-Id: I6eb8faa339a0a6506e21d5c74e5e9b8582e04735
 2016-06-06 21:17:16 +00:00
David Pursell
605628d325 Merge "adbd: properly close subprocess pipes on Ctrl+C." 2016-06-06 21:06:11 +00:00
Sami Tolvanen
830126637a fs_mgr: validate corrected signatures 
If signature verification fails and we have an error corrected
signature available, attempt to verify that instead.

Needs changes from
  Ie913c21ba1d07d6df4c6feeb7226b2ec963f4d19

Bug: 28943429
Change-Id: I7d48701916fe430b17aa05acb120f22a1802733d
 2016-06-06 13:54:00 -07:00
David Pursell
a6d5661140 adbd: properly close subprocess pipes on Ctrl+C. 
When non-interactive sessions exit via Ctrl+C, adbd sends SIGHUP
to the child process to let it know to exit. However, adbd was not
closing the pipes to the child process, so if the subprocess ignored
SIGHUP and continued writing it could fill up the pipe and block
forever while adbd waits for it to exit.

This CL adds the necessary calls to close the subprocess pipe after
sending SIGHUP.

Bug: 28981563
Change-Id: I318e322e563241052648361172f4859c297837fb
(cherry picked from commit f2aa186c7b)
 2016-06-06 12:56:52 -07:00