Commit graph

35921 commits

Author SHA1 Message Date
Christine Hallstrom
0de39b00ee DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e -s ours am: 3c31204e68 -s ours am: 3a66fd2174 -s ours
am: d356bed062  -s ours

Change-Id: I86448f26b974c850e5d65af05503c58772cf4ef7
2017-07-27 22:42:14 +00:00
Christine Hallstrom
9741b4392d DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e -s ours am: 3c31204e68 -s ours am: 3a66fd2174 -s ours
am: c1f776d7d1  -s ours

Change-Id: Iaf1ca67f9f2d33c2be9af9a4cef1935308cd0c36
2017-07-27 22:41:37 +00:00
Christine Hallstrom
773500ee48 DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e -s ours am: 3c31204e68 -s ours am: 3a66fd2174 -s ours
am: c1f776d7d1  -s ours

Change-Id: I4308f9585c3bb1ac5f93a4e2443f775c44316027
2017-07-27 22:41:36 +00:00
Christine Hallstrom
c1f776d7d1 DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e -s ours am: 3c31204e68 -s ours
am: 3a66fd2174  -s ours

Change-Id: I5a2222a551bdfe4077f061131a99c9951cd9c152
2017-07-27 22:38:35 +00:00
Christine Hallstrom
d356bed062 DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e -s ours am: 3c31204e68 -s ours
am: 3a66fd2174  -s ours

Change-Id: I164417e9a6e7995ec1f02d8dd71d14debde74cef
2017-07-27 22:38:35 +00:00
Christine Hallstrom
3a66fd2174 DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e -s ours
am: 3c31204e68  -s ours

Change-Id: I251108805c58aabdd41f31a015a6760ea36878e0
2017-07-27 22:35:35 +00:00
Christine Hallstrom
3c31204e68 DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth
am: 2e06a0ff6e  -s ours

Change-Id: Ib595080a5bd778e6f844657c785708a37277633f
2017-07-27 22:33:22 +00:00
Ben Fennema
7d7e7cdf34 init: fix type of 2nd argument passed to prctl
prctl(PR_SET_SECUREBITS, ...) expects an unsigned long as its 2nd argument.
Passing in a int64_t happens to work with a 64-bit kernel, but does not
work with a 32-bit kernel.

Bug: 63680332
Test: boot 32-bit kernel; verify services with capabilities can successfully
      set those capabilties
Change-Id: I60250d107a77b54b2e9fe3419b4480b921c7e2f8
Signed-off-by: Ben Fennema <fennema@google.com>
(cherry picked from commit a72436067d)
2017-07-27 21:57:40 +00:00
Tom Cherry
684f4883b3 init: only use signed-integer-overflow sanitizer
We've blown up twice in init due to the unsigned integer overflow
sanitizer despite the overflows in question being both defined and
intentional.

Bug: 63680332
Test: boot
Change-Id: I08effe3202ac1367d858982ff5478b3a088bab37
(cherry picked from commit 2ffd65e1d1)
2017-07-27 21:54:47 +00:00
Christine Hallstrom
2e06a0ff6e DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth
Bug: 62410937
Change-Id: Ic6ddba03ee6316dc54d5d41b35c90fe3d9057723
2017-07-27 20:55:12 +00:00
Tom Cherry
67dee626e0 init: remove Parser singleton and related cleanup
* Remove the Parser singleton (Hooray!)
* Rename parser.* to tokenizer.* as this is actually a tokenizer
* Rename init_parser.* to parser.* as this is a generic parser
* Move contents of init_parser_test.cpp to service_test.cpp as this
  actually is a test of the parsing in MakeExecOneshotService() and
  nothing related to (init_)parser.cpp

Test: boot bullhead
Test: bool sailfish
Test: init unit tests
Change-Id: I4fe39e6483f58ebd3ce5ee715a45dbba0acf5d91
2017-07-27 13:23:32 -07:00
Tom Cherry
9909bdb565 Merge "init: shutdown services in the opposite order that they started" am: 8e7942cbd1 am: 9f030d89dc am: 70c71dfe58
am: ae66073276

Change-Id: I96b818458182fd3d27cb8faa5319e05fec5aaf91
2017-07-27 17:54:44 +00:00
Tom Cherry
ae66073276 Merge "init: shutdown services in the opposite order that they started" am: 8e7942cbd1 am: 9f030d89dc
am: 70c71dfe58

Change-Id: If82ec58b0c7f3dc028d61365c280ee0b0f7d3cc5
2017-07-27 17:52:21 +00:00
Tom Cherry
70c71dfe58 Merge "init: shutdown services in the opposite order that they started" am: 8e7942cbd1
am: 9f030d89dc

Change-Id: I5c83460633c56fcf740ca939b0dd931bee6854ab
2017-07-27 17:50:13 +00:00
Tom Cherry
9f030d89dc Merge "init: shutdown services in the opposite order that they started"
am: 8e7942cbd1

Change-Id: Ibd6b25f77dc3f4033902ec25323ff4e6cab024a2
2017-07-27 17:48:12 +00:00
Tom Cherry
8e7942cbd1 Merge "init: shutdown services in the opposite order that they started" 2017-07-27 17:42:46 +00:00
Justin Yun
abc3fd441a Merge "Add system/${LIB}/vndk to default namespace for vendor." into oc-mr1-dev
am: 97d2b6d785

Change-Id: Iac6a578ea7510966cf5c87f5a7b30c8610c8d946
2017-07-27 15:57:02 +00:00
TreeHugger Robot
97d2b6d785 Merge "Add system/${LIB}/vndk to default namespace for vendor." into oc-mr1-dev 2017-07-27 15:47:48 +00:00
Android Build Merger (Role)
6b6d64191c Merge "Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev am: 4ee59e0b51 am: 60364171da" into oc-mr1-dev-plus-aosp 2017-07-27 15:37:44 +00:00
Josh Gao
0c883df0a7 Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev am: 4ee59e0b51
am: 60364171da

Change-Id: I898d52216a39864c724da3e60cd7feee3439a79f
2017-07-27 15:37:29 +00:00
Josh Gao
ee1f234dd9 Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev am: 4ee59e0b51
am: 906222e587

Change-Id: I645aa2213acaba9e32e2eb6f954723d8ef728f78
2017-07-27 15:37:28 +00:00
Josh Gao
906222e587 Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev
am: 4ee59e0b51

Change-Id: Ibbd7c77274075d86fcb3e535f8cbf8a826828c12
2017-07-27 15:35:00 +00:00
Josh Gao
60364171da Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev
am: 4ee59e0b51

Change-Id: I418023c78988508c72557f2c7572efa163a174ef
2017-07-27 15:34:59 +00:00
TreeHugger Robot
4ee59e0b51 Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev 2017-07-27 15:26:00 +00:00
Siqi Lin
afbc027422 Merge "rootdir: record last build fingerprint" am: 4e8227420e am: e5fa38c731 am: 227b806688
am: 879eace02c

Change-Id: I91d9f11e49ac30906e77ee951178f4185d7cad0a
2017-07-27 14:40:28 +00:00
Siqi Lin
879eace02c Merge "rootdir: record last build fingerprint" am: 4e8227420e am: e5fa38c731
am: 227b806688

Change-Id: I85d59996ec87d39de606fb53995f9c6ab7a5f93d
2017-07-27 14:37:59 +00:00
Siqi Lin
227b806688 Merge "rootdir: record last build fingerprint" am: 4e8227420e
am: e5fa38c731

Change-Id: I1bfd0394849fc5b3c54eb951f0e21a49004e6f13
2017-07-27 14:35:27 +00:00
Siqi Lin
e5fa38c731 Merge "rootdir: record last build fingerprint"
am: 4e8227420e

Change-Id: I59664c816a8fbf4d7776270b28f4673418d30bcb
2017-07-27 14:33:02 +00:00
Treehugger Robot
4e8227420e Merge "rootdir: record last build fingerprint" 2017-07-27 14:26:16 +00:00
Josh Gao
8f484a6896 adbd: add logging to troubleshoot usb issues.
Bug: http://b/63899881
Bug: http://b/63901259
Bug: http://b/63904904
Test: treehugger
Change-Id: Ifbc3caa6b416093bf8e127194003747c910352dc
(cherry picked from commit 184f571cfd)
2017-07-27 00:34:31 -07:00
Ben Fennema
983a404e10 Merge "init: fix type of 2nd argument passed to prctl" am: 1b506c54c2 am: f01f4e9d4a am: ec7afe31a0
am: 2953e1af9b

Change-Id: I09b2790e3800bcad1c8639bc13e16a7c066b5477
2017-07-27 07:05:58 +00:00
Ben Fennema
2953e1af9b Merge "init: fix type of 2nd argument passed to prctl" am: 1b506c54c2 am: f01f4e9d4a
am: ec7afe31a0

Change-Id: I2b46745a6d68b4c5fb4b1a91deecb28b0388d6b9
2017-07-27 07:03:30 +00:00
Ben Fennema
ec7afe31a0 Merge "init: fix type of 2nd argument passed to prctl" am: 1b506c54c2
am: f01f4e9d4a

Change-Id: Ie84551e47139dbdbbf7a9a27a849718b43e00fa7
2017-07-27 07:00:28 +00:00
Ben Fennema
f01f4e9d4a Merge "init: fix type of 2nd argument passed to prctl"
am: 1b506c54c2

Change-Id: I5b4de3ee0e55d99e8d63f98fdcbd39de70ff0337
2017-07-27 06:57:58 +00:00
Treehugger Robot
1b506c54c2 Merge "init: fix type of 2nd argument passed to prctl" 2017-07-27 06:51:52 +00:00
Ben Fennema
a72436067d init: fix type of 2nd argument passed to prctl
prctl(PR_SET_SECUREBITS, ...) expects an unsigned long as its 2nd argument.
Passing in a int64_t happens to work with a 64-bit kernel, but does not
work with a 32-bit kernel.

Bug: 63680332
Test: boot 32-bit kernel; verify services with capabilities can successfully
      set those capabilties
Change-Id: I60250d107a77b54b2e9fe3419b4480b921c7e2f8
Signed-off-by: Ben Fennema <fennema@google.com>
2017-07-27 03:31:18 +00:00
Tom Cherry
29c3e7eb65 Merge "init: only use signed-integer-overflow sanitizer" am: a19f481c8c am: 2eada2af9c am: 9d36683fd7
am: a12e34cc31

Change-Id: Ia95c9a4198a0e857d71e79b5595286c57a94e445
2017-07-27 02:38:35 +00:00
Josh Gao
b7dbbee3f0 Merge "adbd: add logging to troubleshoot usb issues." am: 5550901152 am: 07c337bb7d am: 18e429af26
am: 1324a24b26

Change-Id: I214ca0ba3ee58bd7657e40296ad30b6e7e549259
2017-07-27 02:38:07 +00:00
Siqi Lin
a50ed5e05b rootdir: record last build fingerprint am: b9b76de6ff
am: 94aeecea3b

Change-Id: If8e716295ebf8370ed88e4610bce73e8903f793c
2017-07-27 02:37:47 +00:00
Siqi Lin
955968539b rootdir: record last build fingerprint am: b9b76de6ff
am: 8703536332

Change-Id: Icce9ca8bb8ed5c279bfc75734bbd38552547f64e
2017-07-27 02:06:50 +00:00
Tom Cherry
a12e34cc31 Merge "init: only use signed-integer-overflow sanitizer" am: a19f481c8c am: 2eada2af9c
am: 9d36683fd7

Change-Id: I31be7dc0620e55dea1e97f2f26f59dce028cb563
2017-07-27 01:26:33 +00:00
Josh Gao
1324a24b26 Merge "adbd: add logging to troubleshoot usb issues." am: 5550901152 am: 07c337bb7d
am: 18e429af26

Change-Id: I85d859b7fd82b56634fe82dd921f875a206c653e
2017-07-27 01:26:13 +00:00
Siqi Lin
94aeecea3b rootdir: record last build fingerprint
am: b9b76de6ff

Change-Id: Ie1c4444c147969dd74a51ca5acd9fe86825f8e3a
2017-07-27 01:22:57 +00:00
Siqi Lin
8703536332 rootdir: record last build fingerprint
am: b9b76de6ff

Change-Id: I2d781eb8684a860dbb4cb9590ba43bf9d2f3b4c6
2017-07-27 01:21:50 +00:00
Tom Cherry
9d36683fd7 Merge "init: only use signed-integer-overflow sanitizer" am: a19f481c8c
am: 2eada2af9c

Change-Id: Ic0da94313de22222d4312cf097fd5dcd43c76344
2017-07-27 00:58:03 +00:00
Josh Gao
18e429af26 Merge "adbd: add logging to troubleshoot usb issues." am: 5550901152
am: 07c337bb7d

Change-Id: Idc911e96b8fc6698fea18c5a39eb4d786210ec58
2017-07-27 00:57:38 +00:00
Tom Cherry
2eada2af9c Merge "init: only use signed-integer-overflow sanitizer"
am: a19f481c8c

Change-Id: I7f1e3ad1008f4d7d3588bbeca7c72bb0d9defeec
2017-07-27 00:49:55 +00:00
Josh Gao
07c337bb7d Merge "adbd: add logging to troubleshoot usb issues."
am: 5550901152

Change-Id: I3ca18fdd1c55eaca10ad790a6678a7e9e8e974bb
2017-07-27 00:46:21 +00:00
Treehugger Robot
a19f481c8c Merge "init: only use signed-integer-overflow sanitizer" 2017-07-27 00:20:11 +00:00
Treehugger Robot
5550901152 Merge "adbd: add logging to troubleshoot usb issues." 2017-07-27 00:17:15 +00:00