Commit Graph

23663 Commits

Author SHA1 Message Date
David Pursell b8f947f727 Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am: 20352727af

* commit '20352727af3237c600e876162b806ecc2e54bb01':

Change-Id: I1e3467155fcf1158e2fb8fcdf7e97e03440518eb
2016-06-07 04:45:45 +00:00
Tao Bao 27bbf8953d Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev
am: f9b7f7fdba

* commit 'f9b7f7fdba6f62309372fee7c619de1edd8aa389':
  Create /data/ota_package for OTA packages.

Change-Id: I8d0cb3b8687d376efbfbbf186f858bef1c7ccf8e
2016-06-07 04:43:14 +00: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 3b2920a807 Merge "resolve merge conflicts of f6d0da2 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-06-07 04:40:41 +00:00
Collin Mulliner fb9c42648f resolve merge conflicts of cea1d04 to nyc-dev-plus-aosp
am: 8d532e4737

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

Change-Id: I720291ac0966333e56f2607fe219a56bca541ee8
2016-06-07 04:24:27 +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
David Pursell 739f431eea resolve merge conflicts of f6d0da2 to nyc-mr1-dev-plus-aosp
Change-Id: Iefa7d072d50251f4d3376c1f31a6bb1bef05d9af
2016-06-06 17:01:17 -07: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
Tao Bao f9b7f7fdba Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev 2016-06-06 23:43:29 +00: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 f6d0da2b69 adbd: properly close subprocess pipes on Ctrl+C.
am: a6d5661140

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

Change-Id: I96c1fb2036a58702b23f606bb1e6a27f924324eb
2016-06-06 23:18:58 +00:00
David Pursell ae9fe06936 Merge "adbd: properly close subprocess pipes on Ctrl+C." am: 605628d325 am: 5701c58296
am: 27a68ef007

* commit '27a68ef007734929a6cfb46c233c5b1757f7786c':
  adbd: properly close subprocess pipes on Ctrl+C.

Change-Id: Ibc14c8fea014b0d2589db51bb02e86bd069da457
2016-06-06 21:27:07 +00: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
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
David Pursell f2aa186c7b 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
2016-06-06 09:59:34 -07:00
Elliott Hughes 3505b73ff5 Merge "Remove toolbox ioctl." am: 0fdd663262 am: ee915afa21
am: 425c0f9eb7

* commit '425c0f9eb7c6095d261644997658776dc9921166':
  Remove toolbox ioctl.

Change-Id: Ie3018a158829001f16dbcfa525e6f15c8b31f241
2016-06-04 16:35:05 +00:00
Elliott Hughes 425c0f9eb7 Merge "Remove toolbox ioctl." am: 0fdd663262
am: ee915afa21

* commit 'ee915afa2117725bae8a083b9116dd07b4a51e7c':
  Remove toolbox ioctl.

Change-Id: I61c85490b29b2d4de2ffb9cdd7f9fa40e445c28d
2016-06-04 16:31:36 +00:00
Elliott Hughes ee915afa21 Merge "Remove toolbox ioctl."
am: 0fdd663262

* commit '0fdd663262ccaff2f6ac6459a5bd9abf76c2cb5f':
  Remove toolbox ioctl.

Change-Id: I0ed7e7383828619f3804263c18e657efdabf1cb2
2016-06-04 16:25:04 +00:00
Treehugger Robot 0fdd663262 Merge "Remove toolbox ioctl." 2016-06-04 16:14:39 +00:00
Elliott Hughes 1f406e270f Remove toolbox ioctl.
Let's remove this convenient tool for attacking buggy kernels and see if
anyone with a legitimate use notices. I suspect most potential legitimate
users write a short C program instead anyway.

Bug: http://b/29128170
Change-Id: I14e8b8594902951fe0b94c9ce13baa2c4d7b9e6e
2016-06-04 08:12:34 -07:00
Mark Salyzyn 3fbb2acde7 Merge "logpersist: switch to pgrep from ps" am: 68285c0033 am: b749a0c02f
am: 8739660239

* commit '873966023961be5193583a144ba401b6650cddff':
  logpersist: switch to pgrep from ps

Change-Id: Ie4ab24b41006d2be700e73893d8b7ed9be4d5642
2016-06-03 23:35:26 +00:00
Mark Salyzyn 8739660239 Merge "logpersist: switch to pgrep from ps" am: 68285c0033
am: b749a0c02f

* commit 'b749a0c02fa925c77eae7eff5198a5e34be0cfb6':
  logpersist: switch to pgrep from ps

Change-Id: Ia4e06f203824539c3d6f6e7d7f88f1e955a626bf
2016-06-03 21:51:32 +00:00
Mark Salyzyn b749a0c02f Merge "logpersist: switch to pgrep from ps"
am: 68285c0033

* commit '68285c00334af57d9077648fb408a34643514df5':
  logpersist: switch to pgrep from ps

Change-Id: I5a4142c91f152740003c733a1baca8f3318de259
2016-06-03 21:41:03 +00:00
Treehugger Robot 68285c0033 Merge "logpersist: switch to pgrep from ps" 2016-06-03 21:34:01 +00:00
Tao Bao 380d6b1b4d Create /data/ota_package for OTA packages.
We will store OTA packages there for both A/B and non-A/B OTAs. The
directory will be accessed by GMSCore (for both), uncrypt (non-A/B),
update_engine (A/B), update_verifier (A/B) and possibly system server
(for non-A/B OTAs to clean up half-way uncrypt'd packages).

Bug: 28944800
Change-Id: I5aa8156ec5052bd15dfadd4d8c28925d464e4401
2016-06-03 13:11:29 -07:00
Josh Gao 9cc46b972b Merge "cutils: don\'t fortify property_get on clang." am: 310da0b990 am: 2a1f209245
am: 771c1ed582

* commit '771c1ed5826809ab45932e4b768cc9641f9618f9':
  cutils: don't fortify property_get on clang.

Change-Id: I25e041c4cdf757c43bf6c9c2922721b78a1eb44e
2016-06-03 19:53:37 +00:00
Josh Gao 771c1ed582 Merge "cutils: don\'t fortify property_get on clang." am: 310da0b990
am: 2a1f209245

* commit '2a1f20924516b41e22adb766b6751869fb5c3af4':
  cutils: don't fortify property_get on clang.

Change-Id: Idd7402dca16633fa19e2110b6d74b005b3e519f9
2016-06-03 19:46:05 +00:00
Josh Gao 2a1f209245 Merge "cutils: don\'t fortify property_get on clang."
am: 310da0b990

* commit '310da0b9904d33d58315a974351375bbc663bf89':
  cutils: don't fortify property_get on clang.

Change-Id: I04a0ea55a5c5b04d3c2180915bd52a7d3b5a95f3
2016-06-03 19:38:27 +00:00
Treehugger Robot 310da0b990 Merge "cutils: don't fortify property_get on clang." 2016-06-03 19:29:12 +00:00
Android Build Merger (Role) 7288b3bf50 Merge "Revert "adb: close ep0 on disconnection." am: 8c4076295e am: 8edfe2040b" into nyc-mr1-dev-plus-aosp 2016-06-03 04:50:39 +00:00
Siqi Lin 1a60c1a8cf Revert "adb: close ep0 on disconnection." am: 8c4076295e
am: e780adf0fe

* commit 'e780adf0fea32e0b99fbf0078f5fcf23b20e73b3':
  Revert "adb: close ep0 on disconnection."

Change-Id: Ia3fb3d8b2470a8459360f780207a6cbfe39f572d
2016-06-03 04:50:27 +00:00
Siqi Lin 731b4e72b6 Revert "adb: close ep0 on disconnection." am: 8c4076295e
am: 8edfe2040b

* commit '8edfe2040b4c612915bc2cbf1a6db321f586f9fc':
  Revert "adb: close ep0 on disconnection."

Change-Id: I7ec010cf3e36037fc8af04419f85e51f68595c21
2016-06-03 04:50:24 +00:00
Siqi Lin 8edfe2040b Revert "adb: close ep0 on disconnection."
am: 8c4076295e

* commit '8c4076295ebd867d276636d673b9f8e6a8df01a6':
  Revert "adb: close ep0 on disconnection."

Change-Id: I74112ef3f508016238a3eb1224292aa4d77334d5
2016-06-03 04:46:25 +00:00
Siqi Lin e780adf0fe Revert "adb: close ep0 on disconnection."
am: 8c4076295e

* commit '8c4076295ebd867d276636d673b9f8e6a8df01a6':
  Revert "adb: close ep0 on disconnection."

Change-Id: I5b2e4b0aca3547a8cb69e8792e6599f2c79c631b
2016-06-03 04:46:23 +00:00
Siqi Lin 8c4076295e Revert "adb: close ep0 on disconnection."
This reverts commit 69e97e4bee.

Bug: 28932120
Change-Id: I5e2569abed316c089886556c432bfe59bca08549
(cherry picked from commit 57de0514f0)
2016-06-02 17:30:43 -07:00
Josh Gao 74ebdf3c8e cutils: don't fortify property_get on clang.
clang doesn't do the frontend inlining/dead code elimination needed for
the fortified implementation to work. Therefore, turn it off.

Bug: http://b/28381737
Change-Id: Ie8dd970e3908b1daaa587ad2bd041e8f6e2089db
2016-06-02 15:29:11 -07:00
Colin Cross fd4bf14f2e Merge "Remove deprecated Android.mk files" am: ce5b4fee23 am: 5806404e4d
am: bfcb1b779f

* commit 'bfcb1b779fe6a4ce7fae4ba270bbf2483a8f84db':
  Remove deprecated Android.mk files

Change-Id: I2baf4e6a3ca6e2b2ca2b35c54c8c402ba4e5b16c
2016-06-02 16:55:37 +00:00
Mark Salyzyn 1d945119c0 logpersist: switch to pgrep from ps
Changes expected output from a line cut from the less than portable
ps output to reporting the pid of logcatd (uid=logd comm=logcat).
Preserve reporting an error code if logcatd did not start.

Bug: 29075536
Change-Id: I61aa0a4787d4594c415d2c7db5bbb0e512676bf8
2016-06-02 09:51:13 -07:00
Colin Cross bfcb1b779f Merge "Remove deprecated Android.mk files" am: ce5b4fee23
am: 5806404e4d

* commit '5806404e4d693699fef2e710fd8ad836815f8852':
  Remove deprecated Android.mk files

Change-Id: I8a87996377bd53a16d330c0df9bfff84c92e10a2
2016-06-02 16:41:27 +00:00
Colin Cross 5806404e4d Merge "Remove deprecated Android.mk files"
am: ce5b4fee23

* commit 'ce5b4fee23924262c8b3763c71ac5d73625cded2':
  Remove deprecated Android.mk files

Change-Id: Ibf28ba59c997334cb7a0043b370873e3b3817377
2016-06-02 16:38:58 +00:00
Colin Cross ce5b4fee23 Merge "Remove deprecated Android.mk files" 2016-06-02 16:31:42 +00:00
Calin Juravle 8ef4aa3658 Merge "Add utility to prepare files in a similar way to directories" into nyc-dev am: 6a29fe931d
am: 3a8434bf73

* commit '3a8434bf739b3f34281b907912a35815bb6a48a3':

Change-Id: Ife5091af64cc431ff584debc7fbf31a0d106aaca
2016-06-02 10:52:16 +00:00
Calin Juravle 483da3be85 Merge "Add utility to prepare files in a similar way to directories" into nyc-dev am: 6a29fe931d
am: 65d7c4722c

* commit '65d7c4722c7cfe5d8bd98bbd3f38bca97901a06a':
  Add utility to prepare files in a similar way to directories

Change-Id: Ibb9a117e02605f1164d220e58fc84b143e55b9c2
2016-06-02 10:33:42 +00:00
Calin Juravle 65d7c4722c Merge "Add utility to prepare files in a similar way to directories" into nyc-dev
am: 6a29fe931d

* commit '6a29fe931d9fd3bf7f2aad3713dc70c080970763':
  Add utility to prepare files in a similar way to directories

Change-Id: I288024d55e8cead1c902950938b03bfa8dcc3df3
2016-06-02 10:24:54 +00:00
Calin Juravle 3a8434bf73 Merge "Add utility to prepare files in a similar way to directories" into nyc-dev
am: 6a29fe931d

* commit '6a29fe931d9fd3bf7f2aad3713dc70c080970763':
  Add utility to prepare files in a similar way to directories

Change-Id: I7516ecd90c2ba9025e58af184e83b61b5cad9341
2016-06-02 10:24:40 +00:00
Calin Juravle 6a29fe931d Merge "Add utility to prepare files in a similar way to directories" into nyc-dev 2016-06-02 10:10:37 +00:00