Commit graph

12844 commits

Author SHA1 Message Date
Elliott Hughes
ecd6e36d37 am 47a9ef2f: Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures."
* commit '47a9ef2f116fd885a3ba0e9027a45b2a68cc5b3f':
  Improve logging of USBDEVFS_CLAIMINTERFACE failures.
2015-04-25 23:16:46 +00:00
Elliott Hughes
47a9ef2f11 Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures." 2015-04-25 23:05:28 +00:00
Elliott Hughes
ce6363bbbc Improve logging of USBDEVFS_CLAIMINTERFACE failures.
Bug: https://code.google.com/p/android/issues/detail?id=170054
Change-Id: I9b11eb019093e3322da0a8e70d6e17de4c25ab75
2015-04-25 14:44:23 -07:00
Nick Kralevich
ecfb3664fe am 8929c77a: Merge "init: remove mkdir /dev /proc /sys"
* commit '8929c77ab9aa9be612291809669e9162837c54ae':
  init: remove mkdir /dev /proc /sys
2015-04-25 21:19:17 +00:00
Nick Kralevich
8929c77ab9 Merge "init: remove mkdir /dev /proc /sys" 2015-04-25 21:08:12 +00:00
Nick Kralevich
a1f6a4b139 init: remove mkdir /dev /proc /sys
These directories are already present in the initial ramdisk, and
these mkdir calls are no-ops.

Change-Id: I528f9e96a3471de904845a2f9e09c1b6ff83a708
2015-04-25 13:48:26 -07:00
Elliott Hughes
cd58f488c2 am 6ce5625d: Merge "Improve toolbox SIGPIPE behavior."
* commit '6ce5625d58c2376b719802a0ae0b56bcd3afcdc8':
  Improve toolbox SIGPIPE behavior.
2015-04-25 19:26:23 +00:00
Elliott Hughes
6ce5625d58 Merge "Improve toolbox SIGPIPE behavior." 2015-04-25 19:14:54 +00:00
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
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
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
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
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
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
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
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
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
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
Elliott Hughes
5e7dd4454f Improve bad error reporting seen in shamu SELinux boot failures.
Explain why mount failed, and explicitly say that the umount fixed it.

Change-Id: I13b0927a36517f2fc9f9580945ba6ebefc4882df
2015-04-24 11:05:48 -07:00
Tom Cherry
92b8263576 am 10936d1f: Merge "init: consider all platform devices for find_platform_device"
* commit '10936d1fdb639c91ed9062b92909d9928e6b69ea':
  init: consider all platform devices for find_platform_device
2015-04-24 17:42:07 +00:00
Tom Cherry
10936d1fdb Merge "init: consider all platform devices for find_platform_device" 2015-04-24 17:34:32 +00:00
Nick Kralevich
2db3cd3e5e am 46fee19c: Merge "Revert "Make init re-exec itself for its SELinux domain transition.""
* commit '46fee19cb27dd24a58bbcad608058f25ca7b3e52':
  Revert "Make init re-exec itself for its SELinux domain transition."
2015-04-24 17:05:47 +00:00
Nick Kralevich
ac6995690a am f0b47920: Merge "Revert "Remove now-unusable \'setcon\' command.""
* commit 'f0b4792017b338ac6397e9809f3629c33ef94c2d':
  Revert "Remove now-unusable 'setcon' command."
2015-04-24 17:05:46 +00:00
Nick Kralevich
46fee19cb2 Merge "Revert "Make init re-exec itself for its SELinux domain transition."" 2015-04-24 16:58:01 +00:00
Nick Kralevich
4217374611 Revert "Make init re-exec itself for its SELinux domain transition."
shamu isn't booting.

This reverts commit adf0d1bbfa.

Change-Id: I89d568838cebbe14cc4a8ae3843f0f1ac54987af
2015-04-24 16:57:21 +00:00
Nick Kralevich
f0b4792017 Merge "Revert "Remove now-unusable 'setcon' command."" 2015-04-24 16:56:44 +00:00
Nick Kralevich
b862bd00a4 Revert "Remove now-unusable 'setcon' command."
Temporarily revert because device isn't booting.

This reverts commit 7b15ac99f3.

Change-Id: Ice986bac62e20c70f7bedf1744a617b97392ae8c
2015-04-24 16:55:16 +00:00
Mark Salyzyn
1ac79cbd89 liblog: Add BM_is_loggable benchmark
- On a N9 64-bit benchmark, the __android_log_is_loggable overhead
  is roughly 500ns (1/2 of a syscall?)

Bug: 19544788
Bug: 17760225
Bug: 20416721
Change-Id: Ib9e4d06d96e1b19ca5d459e569ead451ef47a9c0
2015-04-24 07:59:44 -07:00
Elliott Hughes
301691c258 am 659b7d63: Merge "Remove now-unusable \'setcon\' command."
* commit '659b7d633a03a03674f82f02f567ac5ff18fba41':
  Remove now-unusable 'setcon' command.
2015-04-24 04:07:24 +00:00
Elliott Hughes
20dfbb0fd1 am fa66b4e1: Merge "Remove long-obsolete file."
* commit 'fa66b4e136e0baeb41311405635d5852048e6ce7':
  Remove long-obsolete file.
2015-04-24 04:07:23 +00:00
Elliott Hughes
659b7d633a Merge "Remove now-unusable 'setcon' command." 2015-04-24 04:01:59 +00:00
Elliott Hughes
fa66b4e136 Merge "Remove long-obsolete file." 2015-04-24 03:59:05 +00:00
Elliott Hughes
2a87d2b155 Remove long-obsolete file.
Change-Id: I728cc13b4a7ac93f9c923d2fc9bda2bb65ffe99d
2015-04-23 20:57:12 -07:00
Elliott Hughes
7b15ac99f3 Remove now-unusable 'setcon' command.
Bug: http://b/19702273
Change-Id: Icd340c80ba074476dcc63f1c1dd5c61a5c768893
2015-04-23 20:54:46 -07:00
Elliott Hughes
2869398351 am 1a39a994: Merge "Correct magic number on umount2"
* commit '1a39a994d9c1d407fec17e0b9a00383d50c48085':
  Correct magic number on umount2
2015-04-24 03:28:43 +00:00