Elliott Hughes
a7cb85ce8e
resolve merge conflicts of 743b0c5 to stage-aosp-master
...
am: 619875061d
2016-07-11 21:03:57 +00:00
Elliott Hughes
619875061d
resolve merge conflicts of 743b0c5 to stage-aosp-master
...
Change-Id: I17c32128b1c376927319183fa78eb60044a7d0b5
2016-07-11 13:59:03 -07:00
Elliott Hughes
743b0c5e35
Merge "Switch run-as to libpackagelistparser."
2016-07-11 20:53:11 +00:00
Jorge Lucangeli Obes
77dbaad7b9
Merge \\"Refactor Service::Start method.\\" am: 82d2bcc21e
...
am: f2ffdac47a
2016-07-11 17:17:05 +00:00
Jorge Lucangeli Obes
f2ffdac47a
Merge \"Refactor Service::Start method.\"
...
am: 82d2bcc21e
2016-07-11 17:13:26 +00:00
Treehugger Robot
82d2bcc21e
Merge "Refactor Service::Start method."
2016-07-11 17:08:45 +00:00
Jorge Lucangeli Obes
344d01f99f
Refactor Service::Start method.
...
This CL extracts code from Service::Start into four helper functions,
bringing Service::Start down to 134 lines vs 212 lines originally. This
makes the method a lot easier to follow. There is no change in behaviour.
Also, make error messages consistent (start with lowercase) and
format Service::Start to fit in 100 cols.
Bug: 30035168
Change-Id: If979976fba4d339a336d030f802ca9f169fd012c
2016-07-11 09:57:17 -04:00
Dan Willemsen
a5b9b8f452
Merge \\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\" am: 5d420e791b
...
am: bdd01e86a5
2016-07-09 06:05:52 +00:00
Dan Willemsen
bdd01e86a5
Merge \"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\"
...
am: 5d420e791b
2016-07-09 06:03:09 +00:00
Dan Willemsen
5d420e791b
Merge "Use BOARD_USES_VENDORIMAGE to detect vendor image presence"
2016-07-09 05:57:55 +00:00
Dan Willemsen
0790431f75
Use BOARD_USES_VENDORIMAGE to detect vendor image presence
...
When building without vendor/... in the tree, we won't be creating a
vendorimage, so BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE won't be defined. But
we still need to use the vendor image that will be present.
Bug: 30040825
Change-Id: I756adc615aea11da60da4d3a4568caca9fed93ab
2016-07-08 18:17:48 -07:00
Elliott Hughes
7288ac3982
Merge \\"Make klog_fd thread-safe and make klog_init a no-op.\\" am: 588b770063
...
am: 73d363bbc1
2016-07-08 17:09:08 +00:00
Elliott Hughes
73d363bbc1
Merge \"Make klog_fd thread-safe and make klog_init a no-op.\"
...
am: 588b770063
2016-07-08 17:05:25 +00:00
Elliott Hughes
588b770063
Merge "Make klog_fd thread-safe and make klog_init a no-op."
2016-07-08 17:01:13 +00:00
Erik Kline
9f31416013
Merge \\"Add UIDs for system DNS and tethering DNS\\" am: c4dc4f3fc2
...
am: fcf3ed51dc
2016-07-08 08:51:43 +00:00
Erik Kline
fcf3ed51dc
Merge \"Add UIDs for system DNS and tethering DNS\"
...
am: c4dc4f3fc2
2016-07-08 08:48:11 +00:00
Treehugger Robot
c4dc4f3fc2
Merge "Add UIDs for system DNS and tethering DNS"
2016-07-08 08:43:55 +00:00
Elliott Hughes
0c8bf5798f
Switch run-as to libpackagelistparser.
...
We already have to have a Java and a native implementation; we don't
need _two_ native implementations.
Change-Id: I0201205ce5079ef9c747abc37b0c8122cf8fb136
2016-07-07 16:50:32 -07:00
Mark Salyzyn
4c04c98a31
Merge \\"logcat: help spelling correction\\" am: 20a172fca7
...
am: 59cce987ec
2016-07-06 21:49:12 +00:00
Mark Salyzyn
59cce987ec
Merge \"logcat: help spelling correction\"
...
am: 20a172fca7
2016-07-06 21:46:29 +00:00
Treehugger Robot
20a172fca7
Merge "logcat: help spelling correction"
2016-07-06 21:36:07 +00:00
Mark Salyzyn
e735a7305b
logcat: help spelling correction
...
threadtime and added clarity for adverbs
Bug: 29916087
Change-Id: Idbed8bc74147c105eaced940d035d0649a244b18
2016-07-06 13:33:57 -07:00
Mark Salyzyn
b6dbe28746
Merge \\"logcat: format verbs and adverbs\\" am: 82fb012a03
...
am: b13d0ce160
2016-07-06 20:32:07 +00:00
Mark Salyzyn
b13d0ce160
Merge \"logcat: format verbs and adverbs\"
...
am: 82fb012a03
2016-07-06 20:27:29 +00:00
Treehugger Robot
82fb012a03
Merge "logcat: format verbs and adverbs"
2016-07-06 20:18:00 +00:00
Mark Salyzyn
a8dbadd54e
Merge \\"libcutils: canned_fs_config.c drop tabs\\" am: 4ee9ed5366
...
am: ec129fe06c
2016-07-06 18:56:34 +00:00
Mark Salyzyn
ec129fe06c
Merge \"libcutils: canned_fs_config.c drop tabs\"
...
am: 4ee9ed5366
2016-07-06 18:54:23 +00:00
Treehugger Robot
4ee9ed5366
Merge "libcutils: canned_fs_config.c drop tabs"
2016-07-06 18:50:22 +00:00
Mark Salyzyn
9cfd1c6ebc
logcat: format verbs and adverbs
...
Bug: 29916087
Change-Id: I039c95b9dc0aa88f1219121513899934381453ae
2016-07-06 11:16:07 -07:00
Mark Salyzyn
768cbb0404
libcutils: canned_fs_config.c drop tabs
...
- replace tabs with spaces, get indent right
- Sort header order as per Android coding standard
Change-Id: I634f6f716a368ce5565ccc880c51406042f312bf
2016-07-06 10:45:11 -07:00
Erik Kline
d63cf7d85a
Add UIDs for system DNS and tethering DNS
...
Bug: 29420831
Bug: 29881876
Change-Id: I7a48f980f0e52a3d322c4c02988d48fc6df643ca
2016-07-06 11:13:59 +09:00
Elliott Hughes
dc4493cbbb
Merge \\"Fix the generated getevent labels.\\" am: 80beb506cf
...
am: 2f589bf974
2016-06-29 23:50:35 +00:00
Elliott Hughes
2f589bf974
Merge \"Fix the generated getevent labels.\"
...
am: 80beb506cf
2016-06-29 23:48:12 +00:00
Treehugger Robot
80beb506cf
Merge "Fix the generated getevent labels."
2016-06-29 23:43:15 +00:00
Elliott Hughes
171a829c39
Make klog_fd thread-safe and make klog_init a no-op.
...
I'll come back and remove klog_init when I've removed other calls to it.
Change-Id: Iad7fd26d853b4ddc54e9abd44516b6f138cbbfcb
Test: booted N9, looked at "adb shell dmesg" output.
2016-06-29 16:16:41 -07:00
Jorge Lucangeli Obes
763581ec76
Merge \\"Rename \\"Handle(r)\\" to \\"Parse(r)\\" in Android init.\\" am: b0d062a497
...
am: 69e6dde7c6
2016-06-29 21:53:39 +00:00
Jorge Lucangeli Obes
69e6dde7c6
Merge \"Rename \"Handle(r)\" to \"Parse(r)\" in Android init.\"
...
am: b0d062a497
2016-06-29 21:51:08 +00:00
Treehugger Robot
b0d062a497
Merge "Rename "Handle(r)" to "Parse(r)" in Android init."
2016-06-29 21:46:02 +00:00
Elliott Hughes
b22b9987a8
Fix the generated getevent labels.
...
Some of the less-used stuff stayed behind in input.h, so we need to
parse both files.
Change-Id: Iff2b6e3fc4f5a6584169d12f16427b4f235da21a
Test: manual inspection of the generated file.
2016-06-29 14:12:29 -07:00
Jorge Lucangeli Obes
fa9965feed
Merge \\"init: Add option to run a service in a new PID/mount namespace.\\" am: e71cedf450
...
am: 5b951eebec
2016-06-29 20:31:44 +00:00
Jorge Lucangeli Obes
177b27d4f5
Rename "Handle(r)" to "Parse(r)" in Android init.
...
The code in question parses config files, so use the right terminology.
Bug: 29872991
Change-Id: Id9644d9a98c1d702d2990f62b3020a27d073141e
2016-06-29 16:29:53 -04:00
Jorge Lucangeli Obes
5b951eebec
Merge \"init: Add option to run a service in a new PID/mount namespace.\"
...
am: e71cedf450
2016-06-29 20:29:07 +00:00
Treehugger Robot
e71cedf450
Merge "init: Add option to run a service in a new PID/mount namespace."
2016-06-29 20:20:16 +00:00
Jorge Lucangeli Obes
1b3fa3d650
init: Add option to run a service in a new PID/mount namespace.
...
Namespaces are a more consistent isolation primitive than e.g. hiding
/proc.
Bug: 29635190
Change-Id: I7c39975813fb13b3d06be35a24c0854f16549c0a
2016-06-29 14:49:11 -04:00
Elliott Hughes
cee6305779
Merge \\"Remove unnecessary ARRAY_SIZE macros.\\" am: c37d8ea22a
...
am: 7191a56e96
2016-06-29 00:19:17 +00:00
Elliott Hughes
7191a56e96
Merge \"Remove unnecessary ARRAY_SIZE macros.\"
...
am: c37d8ea22a
2016-06-29 00:16:44 +00:00
Treehugger Robot
c37d8ea22a
Merge "Remove unnecessary ARRAY_SIZE macros."
2016-06-29 00:12:25 +00:00
Elliott Hughes
6604785e41
Merge \\"Lose start/stop to toybox.\\" am: 76ef4e8ae2
...
am: 6beba74a40
2016-06-28 23:55:39 +00:00
Elliott Hughes
6beba74a40
Merge \"Lose start/stop to toybox.\"
...
am: 76ef4e8ae2
2016-06-28 23:53:07 +00:00
Treehugger Robot
76ef4e8ae2
Merge "Lose start/stop to toybox."
2016-06-28 23:46:50 +00:00
