Elliott Hughes
5976018b4a
Improve toolbox SIGPIPE behavior.
...
None of our tools -- except for top, which I'd fixed previously --
handles SIGPIE correctly. Let's just handle SIGPIPE in the driver.
Bug: https://code.google.com/p/android/issues/detail?id=157920
Change-Id: I322ea411f53c71585a64118c217d54389f675d4e
2015-04-25 12:03:41 -07:00
Elliott Hughes
bdabdd9279
am 75e18f3b: am 5281a2a8: am 9798023e: Merge "Add ReadFully and WriteFully to libbase."
...
* commit '75e18f3bced9f59791fb0774e7fbfd1ff1b38732':
Add ReadFully and WriteFully to libbase.
2015-04-25 05:37:20 +00:00
Elliott Hughes
a81ee72c2e
am 2b57981b: am ae3154e3: am 2899c94b: Merge "Switch init to epoll."
...
* commit '2b57981b05a3771bfce01e801581442e4b63299f':
Switch init to epoll.
2015-04-25 05:37:18 +00:00
Elliott Hughes
75e18f3bce
am 5281a2a8: am 9798023e: Merge "Add ReadFully and WriteFully to libbase."
...
* commit '5281a2a8e9df51cc7c5c17400dbeae6983818a38':
Add ReadFully and WriteFully to libbase.
2015-04-25 05:21:45 +00:00
Elliott Hughes
2b57981b05
am ae3154e3: am 2899c94b: Merge "Switch init to epoll."
...
* commit 'ae3154e3968e991fb1e9a6b47bedd1e0819f7925':
Switch init to epoll.
2015-04-25 05:21:43 +00:00
Elliott Hughes
5281a2a8e9
am 9798023e: Merge "Add ReadFully and WriteFully to libbase."
...
* commit '9798023e9f646a51222b5fd4683c91bfbfc5167f':
Add ReadFully and WriteFully to libbase.
2015-04-25 05:11:00 +00:00
Elliott Hughes
ae3154e396
am 2899c94b: Merge "Switch init to epoll."
...
* commit '2899c94b9d962c308ef71ee10809c61ac39e0ce5':
Switch init to epoll.
2015-04-25 05:10:59 +00:00
Elliott Hughes
9798023e9f
Merge "Add ReadFully and WriteFully to libbase."
2015-04-25 05:01:21 +00:00
Elliott Hughes
2899c94b9d
Merge "Switch init to epoll."
2015-04-25 05:01:03 +00:00
Elliott Hughes
56085edbf8
Add ReadFully and WriteFully to libbase.
...
Change-Id: I6b7aa2a93398e7acdd1d74c71d9abed08a72b3c4
2015-04-24 21:57:16 -07:00
Elliott Hughes
929f407076
Switch init to epoll.
...
Not just because it's what the cool kids are doing --- it also lets us
simplify the inner loop and decouple it from whatever systems want to
be woken to perform some activity if there's data to be read on some fd.
Currently this is just used to clean up the existing signal handling,
keychord, and property service code.
Change-Id: I4d7541a2c4386957ad877df69e3be08b96a7dec5
2015-04-24 21:13:44 -07:00
Elliott Hughes
69da8a1d6b
am 52e5e55c: am 0a4f0be2: am df5d4482: Merge "Clean up property service initialization."
...
* commit '52e5e55cac4e630e4eac59c387815aa307194540':
Clean up property service initialization.
2015-04-25 03:20:54 +00:00
Elliott Hughes
52e5e55cac
am 0a4f0be2: am df5d4482: Merge "Clean up property service initialization."
...
* commit '0a4f0be2aaf697ca4b0938b31fc19bb007e87d0d':
Clean up property service initialization.
2015-04-25 02:57:36 +00:00
Elliott Hughes
0a4f0be2aa
am df5d4482: Merge "Clean up property service initialization."
...
* commit 'df5d4482074fc68a25a6a33992f3fc5164c2d3ec':
Clean up property service initialization.
2015-04-25 02:46:39 +00:00
Elliott Hughes
df5d448207
Merge "Clean up property service initialization."
2015-04-25 02:36:46 +00:00
Elliott Hughes
c6c26ed781
Clean up property service initialization.
...
All the code that was being delayed does is create a socket. We can
do that straight away, avoid the overhead, and simplify our main loop.
The keychord fd, on the other hand, seems a little tricky. It looks
like /dev/keychord isn't immediately available, at least not on N9;
we have to wait for ueventd to set us up the bomb.
Change-Id: I020e75b8e4b233497707f0a3cbbb6038b714161f
2015-04-24 19:15:20 -07:00
Elliott Hughes
27da59b2de
am 799d8a16: am d503cc21: am b749be0b: Merge "Clean up init signal handling a little."
...
* commit '799d8a165ba2b7a14274996bba56a627f278e2a3':
Clean up init signal handling a little.
2015-04-25 02:12:34 +00:00
Elliott Hughes
799d8a165b
am d503cc21: am b749be0b: Merge "Clean up init signal handling a little."
...
* commit 'd503cc21ec663b39e8d84feb373d3a287bb02d63':
Clean up init signal handling a little.
2015-04-25 01:31:14 +00:00
Elliott Hughes
d503cc21ec
am b749be0b: Merge "Clean up init signal handling a little."
...
* commit 'b749be0bc36b3ae610aa05541581ef8cc5e484ee':
Clean up init signal handling a little.
2015-04-25 01:20:29 +00:00
Elliott Hughes
b749be0bc3
Merge "Clean up init signal handling a little."
2015-04-25 01:10:58 +00:00
Elliott Hughes
457cdc538a
am 7c6d5dd8: am bdf133de: am 662baefb: Merge "Setup signal handler before any exec command"
...
* commit '7c6d5dd8635751364ba7b5fc6452750a6203d32c':
Setup signal handler before any exec command
2015-04-25 01:09:42 +00:00
Elliott Hughes
9042cae40b
Clean up init signal handling a little.
...
We can set it up earlier, and error reporting like this helped me find
the SELinux problem with the last change to this code.
Change-Id: If0f38bc5ff0465c4030e2d39d34f31f49b2d8487
2015-04-24 17:43:21 -07:00
Elliott Hughes
7c6d5dd863
am bdf133de: am 662baefb: Merge "Setup signal handler before any exec command"
...
* commit 'bdf133de65a1fbb2d5e91fcd854d9824bcff4ea1':
Setup signal handler before any exec command
2015-04-25 00:42:58 +00:00
Elliott Hughes
bdf133de65
am 662baefb: Merge "Setup signal handler before any exec command"
...
* commit '662baefbb7ceaf2f2502f4e7752d4a6d835f216a':
Setup signal handler before any exec command
2015-04-25 00:31:12 +00:00
Elliott Hughes
662baefbb7
Merge "Setup signal handler before any exec command"
2015-04-25 00:24:55 +00:00
Lajos Molnar
90686d8e97
Merge "media: reserve color formats used by flex-YUV422/444 and RGB/A888"
2015-04-24 23:54:48 +00:00
Lajos Molnar
e632c1bf0c
media: reserve color formats used by flex-YUV422/444 and RGB/A888
...
These are used by Image when MediaCodec produces a non-surface
higher-resolution YUV image, or codec-specific ordered RGB/A image
Change-Id: Ie5cd8236586b375cbc707d45584bd35415c274fc
2015-04-24 23:43:57 +00:00
Andres Morales
1caa605547
Merge "Make clear SID delete the file"
2015-04-24 23:20:19 +00:00
Mark Salyzyn
8b47d3ee65
am 2bca03cd: am a76d2bb4: am 05c92d2b: Merge "liblog: Add BM_is_loggable benchmark"
...
* commit '2bca03cd0c8ad7f0d55b1d7f6acc03257077f854':
liblog: Add BM_is_loggable benchmark
2015-04-24 22:24:04 +00:00
Mark Salyzyn
2bca03cd0c
am a76d2bb4: am 05c92d2b: Merge "liblog: Add BM_is_loggable benchmark"
...
* commit 'a76d2bb40be45d5523182ebedd145503904f1f25':
liblog: Add BM_is_loggable benchmark
2015-04-24 22:06:19 +00:00
Mark Salyzyn
a76d2bb40b
am 05c92d2b: Merge "liblog: Add BM_is_loggable benchmark"
...
* commit '05c92d2b4fa7e96f6e64384f197e12916ed1d821':
liblog: Add BM_is_loggable benchmark
2015-04-24 21:54:42 +00:00
Mark Salyzyn
05c92d2b4f
Merge "liblog: Add BM_is_loggable benchmark"
2015-04-24 21:42:47 +00:00
Mark Salyzyn
5cb4c8796c
Revert "STOPSHIP: WifiStateMachine logging temporarily disabled"
...
This reverts commit 15ae6c2e7c
.
Change-Id: I281a65209a5118a6c73ddec65ed40d149c23bf0b
2015-04-24 21:32:17 +00:00
Mark Salyzyn
b2beaf7b20
Merge "Revert "STOPSHIP: Additional Wifi logging temporarily disabled""
2015-04-24 21:30:22 +00:00
Elliott Hughes
013708c43f
am 813c769c: am e6433c12: am a5669861: Merge "Revert "Revert "Remove now-unusable \'setcon\' command."""
...
* commit '813c769cf6c14e8bca89cb2b18b8d1c156a7b126':
Revert "Revert "Remove now-unusable 'setcon' command.""
2015-04-24 21:27:19 +00:00
Elliott Hughes
03c9267865
am a8088f38: am ec389902: am 132440b0: Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition."""
...
* commit 'a8088f380932d873a39fafdd816f96328f7caa9c':
Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
2015-04-24 21:09:34 +00:00
Elliott Hughes
4822bd197d
am 92f075aa: am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures."
...
* commit '92f075aa08a2665ad03c80a0408667f8864f1ecd':
Improve bad error reporting seen in shamu SELinux boot failures.
2015-04-24 21:09:00 +00:00
Elliott Hughes
813c769cf6
am e6433c12: am a5669861: Merge "Revert "Revert "Remove now-unusable \'setcon\' command."""
...
* commit 'e6433c12456324812a9ea791da3bf462ee2476d7':
Revert "Revert "Remove now-unusable 'setcon' command.""
2015-04-24 20:45:29 +00:00
Elliott Hughes
e6433c1245
am a5669861: Merge "Revert "Revert "Remove now-unusable \'setcon\' command."""
...
* commit 'a5669861c1abd023aa708d21e6f9d7f2c8803903':
Revert "Revert "Remove now-unusable 'setcon' command.""
2015-04-24 20:39:14 +00:00
Elliott Hughes
a5669861c1
Merge "Revert "Revert "Remove now-unusable 'setcon' command."""
2015-04-24 20:31:19 +00:00
Mark Salyzyn
ea782d327a
Revert "STOPSHIP: Additional Wifi logging temporarily disabled"
...
This reverts commit 18b1da2033
.
Change-Id: I86cde061a36a9a9e43c8a5df2df1e853ed32b7a0
2015-04-24 20:28:27 +00:00
Elliott Hughes
a8088f3809
am ec389902: am 132440b0: Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition."""
...
* commit 'ec389902980c88956ab8e3e630e3503cbb22d39b':
Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
2015-04-24 19:54:09 +00:00
Elliott Hughes
ec38990298
am 132440b0: Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition."""
...
* commit '132440b087d35ebddd021b86bdcb3aa5c8feec80':
Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
2015-04-24 19:43:14 +00:00
Elliott Hughes
c7ca9dd6c8
Revert "Revert "Remove now-unusable 'setcon' command.""
...
This reverts commit b862bd00a4
.
This change was fine but an earlier change it depended on was broken.
That change has been fixed and resubmitted.
Bug: http://b/19702273
Change-Id: I17e565721026e48e2a73526f729f2481d4d6edb5
2015-04-24 12:41:47 -07:00
Elliott Hughes
132440b087
Merge "Revert "Revert "Make init re-exec itself for its SELinux domain transition."""
2015-04-24 19:33:21 +00:00
Elliott Hughes
f65730e620
Revert "Revert "Make init re-exec itself for its SELinux domain transition.""
...
This reverts commit 4217374611
.
It turns out that the kernel passes any unrecognized arguments on to init,
and (at least) N6 and N9 have such arguments. My lazy check of argc was
thus insufficient to recognize what stage of init we were in, so we'd
skip to stage 2 and not set up SELinux. And apparently you can get a
very long way with SELinux off... We'll fix that in a later change.
Bug: 19702273
Change-Id: I43b3fb722fed35dd217cb529cbcac9a29aff4e4b
2015-04-24 12:26:05 -07:00
Elliott Hughes
92f075aa08
am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures."
...
* commit '48ba758782bed8c50f450fd77c4b3284c3fa7316':
Improve bad error reporting seen in shamu SELinux boot failures.
2015-04-24 18:58:21 +00:00
Elliott Hughes
48ba758782
am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures."
...
* commit '34dd04dbb53bc6dc1ec4f9c6639b10acb7c53c72':
Improve bad error reporting seen in shamu SELinux boot failures.
2015-04-24 18:46:59 +00:00
Elliott Hughes
34dd04dbb5
Merge "Improve bad error reporting seen in shamu SELinux boot failures."
2015-04-24 18:36:55 +00:00
Tom Cherry
f42a722d7c
am 17560f88: am 92b82635: am 10936d1f: Merge "init: consider all platform devices for find_platform_device"
...
* commit '17560f8884a01f12ac3bea15246d10c4eea19638':
init: consider all platform devices for find_platform_device
2015-04-24 18:13:57 +00:00