Commit Graph

12957 Commits

Author SHA1 Message Date
Mark Salyzyn 7ad506839a am 6025a2bc: am bd518bce: Merge changes I3187aa34,Iadac58e6
* commit '6025a2bc493534b3003ebd2ad7130366cf4f6723':
  init.rc: logd --reinit on changes to persistent properties
  logd: add reinit command
2015-03-13 07:09:39 +00:00
Mark Salyzyn 959470f722 am 76d59f3d: am 54c22e5b: Merge "logcat: test: logcat.logrotate fails"
* commit '76d59f3d1093070f78913ccec35a28d4cd66803d':
  logcat: test: logcat.logrotate fails
2015-03-13 07:09:38 +00:00
Mark Salyzyn 61e8b3855d am 77b87b5b: am ecd993d7: Merge "logcat: fortify help on filterspec"
* commit '77b87b5b863c643bbec4864fcebf4adf99933149':
  logcat: fortify help on filterspec
2015-03-13 07:09:37 +00:00
Nick Kralevich 3c6ec13fe1 am 0d6fca8a: am 7e9fe7d8: Merge "builtins: remove setenforce command"
* commit '0d6fca8a4f9a89752d80296abb4031aafe070b9f':
  builtins: remove setenforce command
2015-03-13 06:33:07 +00:00
Elliott Hughes 76e563a718 am b02a734d: am 0a92c8c4: Merge "Fix a printf format string (caught by clang but not GCC)."
* commit 'b02a734d4cf8d9d2032fb167dcecf530ea8ea303':
  Fix a printf format string (caught by clang but not GCC).
2015-03-13 02:58:14 +00:00
Dan Albert 47145db46e resolved conflicts for merge of 5ebc2f5b to master
Change-Id: I9fdb437051e2f1c9afef13101ae40f881c4c6f19
2015-03-12 16:57:31 -07:00
Mark Salyzyn 6025a2bc49 am bd518bce: Merge changes I3187aa34,Iadac58e6
* commit 'bd518bce07094ccc2e91df67e072de94ca7db442':
  init.rc: logd --reinit on changes to persistent properties
  logd: add reinit command
2015-03-12 21:39:11 +00:00
Mark Salyzyn 76d59f3d10 am 54c22e5b: Merge "logcat: test: logcat.logrotate fails"
* commit '54c22e5b0af8b8799a7c473c7a76e44ca018742c':
  logcat: test: logcat.logrotate fails
2015-03-12 21:39:10 +00:00
Mark Salyzyn 77b87b5b86 am ecd993d7: Merge "logcat: fortify help on filterspec"
* commit 'ecd993d74fafd762dad69cee97b3d84ce5806074':
  logcat: fortify help on filterspec
2015-03-12 21:39:08 +00:00
Mark Salyzyn bd518bce07 Merge changes I3187aa34,Iadac58e6
* changes:
  init.rc: logd --reinit on changes to persistent properties
  logd: add reinit command
2015-03-12 20:34:01 +00:00
Mark Salyzyn 54c22e5b0a Merge "logcat: test: logcat.logrotate fails" 2015-03-12 20:15:17 +00:00
Mark Salyzyn 9c51243d8b logcat: test: logcat.logrotate fails
Test did not handle all possible multiples of block sizes.

Bug: 19604106
Change-Id: I693358be9598926389631baf21c5883e0f2fd735
2015-03-12 20:11:36 +00:00
Mark Salyzyn ecd993d74f Merge "logcat: fortify help on filterspec" 2015-03-12 20:10:18 +00:00
Mark Salyzyn 48d06069a8 init.rc: logd --reinit on changes to persistent properties
Bug: 19681572
Change-Id: I3187aa348dae79fa5822ffb7ee9566919a7a04e6
2015-03-12 12:24:53 -07:00
Mark Salyzyn 11e55cb9c1 logd: add reinit command
- respond to SIGHUP
- respond to logd command "reinit"
- respond to logd --reinit
- reopens files on /data, eg: re-read of persistent properties

Bug: 19681572
Change-Id: Iadac58e6653f027cb7355497bd675eef376ce0a8
2015-03-12 12:24:47 -07:00
Nick Kralevich 0d6fca8a4f am 7e9fe7d8: Merge "builtins: remove setenforce command"
* commit '7e9fe7d86de665bcb2615d8c24de39416c48cdec':
  builtins: remove setenforce command
2015-03-12 01:04:39 +00:00
Nick Kralevich 7e9fe7d86d Merge "builtins: remove setenforce command" 2015-03-12 00:51:49 +00:00
Nick Kralevich cee683e290 builtins: remove setenforce command
Adding "setenforce 0" to init.rc isn't a supported way to turn off
SELinux, and doesn't work with AOSP SELinux policy. Remove the code
from init.

Change-Id: If8c8149560789c9a7ba518a0a100e6033bb68898
2015-03-11 17:48:45 -07:00
Sami Tolvanen bdd7cbd85d am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init through libfs_mgr"
* commit 'fcd14f13a1e05bc1958bfeaba95678b9bf4b121e':
  Do not call libcutils property_set in init through libfs_mgr
2015-03-11 23:02:32 +00:00
Greg Hackmann 60d5183396 am 469c34e7: am 54352700: Merge "libadf: enable -Werror"
* commit '469c34e78ffe2df159dcd1977633ba35140fad03':
  libadf: enable -Werror
2015-03-11 23:02:20 +00:00
Greg Hackmann ecdf6e5cb1 am 399dcb7e: am bf36cc57: Merge "libadf: tests: fix signed/unsigned comparison warnings"
* commit '399dcb7e9dc42af474f593d95ff6333a6761cffe':
  libadf: tests: fix signed/unsigned comparison warnings
2015-03-11 23:02:19 +00:00
Jeff Brown 7a0310ef67 Fixed subtle bugs related to file descriptor recycling.
Added code to protect against situations that may occur when a
Looper callback has the side-effect of closing the file descriptor that
it is watching before it returns.  This code pattern is very
convenient for implementation but it does expose issues in how
the list of callbacks is maintained.  In particular, we
need to watch out for file descriptors which have been reused.

This change may resolve previously unexplained ANRs associated with
log messages such as: "Error modifying epoll events for fd 44, errno=2"

Bug: 10349083
Change-Id: I20eedf6ffbdeda382653ca0104962505194741b0
2015-03-11 15:00:36 -07:00
Jeff Brown 27e5721860 Rename Looper::isIdling() to isPolling() to resolve confusion.
The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events.  However it's
still a good signal as to whether the loop is alive.

Bug: 19532373
Change-Id: I555c473e70ffd8a56e1b10aa60026eb674a16de9
2015-03-11 15:00:36 -07:00
Dimitry Ivanov 40ed4f5d5e am 44ad0f9b: am ddd97caf: am b27bd948: Merge "Generate gnu hash for arm only"
* commit '44ad0f9b1f1f06f4db58f985c847f455c3b02e3c':
  Generate gnu hash for arm only
2015-03-11 20:08:56 +00:00
Elliott Hughes b02a734d4c am 0a92c8c4: Merge "Fix a printf format string (caught by clang but not GCC)."
* commit '0a92c8c4799e86d690de860f96ad6abb86357c3b':
  Fix a printf format string (caught by clang but not GCC).
2015-03-11 19:57:47 +00:00
Elliott Hughes 0a92c8c479 Merge "Fix a printf format string (caught by clang but not GCC)." 2015-03-11 19:32:47 +00:00
Elliott Hughes 58c3bacc38 Fix a printf format string (caught by clang but not GCC).
Change-Id: I665756615eef74b05ef92f5865d910f29ead0695
2015-03-11 12:31:53 -07:00
Elliott Hughes 5ebc2f5b84 am a4d98484: Merge "Implement exec."
* commit 'a4d98484a2b64d215d1d35830693a16cf2873308':
  Implement exec.
2015-03-11 18:32:30 +00:00
Elliott Hughes a4d98484a2 Merge "Implement exec." 2015-03-11 18:20:29 +00:00
Sami Tolvanen fcd14f13a1 am 9fabbbfb: Merge "Do not call libcutils property_set in init through libfs_mgr"
* commit '9fabbbfb03a877e13936b8829e4641cf1b9aebb7':
  Do not call libcutils property_set in init through libfs_mgr
2015-03-11 09:27:15 +00:00
Sami Tolvanen 9fabbbfb03 Merge "Do not call libcutils property_set in init through libfs_mgr" 2015-03-11 09:14:55 +00:00
Greg Hackmann 469c34e78f am 54352700: Merge "libadf: enable -Werror"
* commit '54352700c706294a404143b641a56462f671b762':
  libadf: enable -Werror
2015-03-11 03:19:23 +00:00
Greg Hackmann 399dcb7e9d am bf36cc57: Merge "libadf: tests: fix signed/unsigned comparison warnings"
* commit 'bf36cc57c32c9f0054803e8b2f8e03acd0a25a06':
  libadf: tests: fix signed/unsigned comparison warnings
2015-03-11 03:19:22 +00:00
Greg Hackmann 54352700c7 Merge "libadf: enable -Werror" 2015-03-11 00:00:34 +00:00
Greg Hackmann bf36cc57c3 Merge "libadf: tests: fix signed/unsigned comparison warnings" 2015-03-10 23:59:45 +00:00
Andy Hung 17e8158635 Merge "Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BIT" 2015-03-10 23:25:02 +00:00
Andy Hung 4ff72b52a2 Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BIT
Should be Q8.23 (24 bits packed in the least significant
3 bytes).

Change-Id: If5ca27c27249487e28c0be42ebdd283308ff8552
2015-03-10 16:01:49 -07:00
Greg Hackmann e6b793c7b0 libadf: enable -Werror
Bug: 19606869

Change-Id: If2ea55732e71e8288641b6b34d229b367fd3fb3b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-10 15:14:38 -07:00
Greg Hackmann 39b0c1c67d libadf: tests: fix signed/unsigned comparison warnings
Bug: 19606869

Change-Id: I29cfa363b6640cc13973c1023d2f4ea1a97e3af2
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-10 15:14:38 -07:00
Elliott Hughes f50fccb246 am 6a8ed4b6: am d3e877f8: am ad571cdd: Merge "Add backtrace support for mips64."
* commit '6a8ed4b6c05fe471e2398a7be1c48695e4c49194':
  Add backtrace support for mips64.
2015-03-10 22:04:43 +00:00
Elliott Hughes d997b8e018 am dccf65ef: am 1f909334: am ed5b81c9: Merge "Fix LP32 build."
* commit 'dccf65ef024978ce26ddc96ced58b2417a50967f':
  Fix LP32 build.
2015-03-10 22:04:41 +00:00
Elliott Hughes 9433c3bb4c am 264157d9: am 8576aa05: am 9cce837d: Merge "Increase output width for wchan and pc on 64 bit targets."
* commit '264157d97e0220cee69b798cbf435548f332f240':
  Increase output width for wchan and pc on 64 bit targets.
2015-03-10 22:04:40 +00:00
Dmitriy Ivanov 73f2a95558 am 682b6460: am 4c37448f: am 19833d24: Merge "Generate sysv hash for liblog"
* commit '682b6460611089926be0b420e0329f48c640a3d9':
  Generate sysv hash for liblog
2015-03-10 22:04:39 +00:00
Dan Albert be745f9e10 am f741fc00: am ee3e49cf: am ad5ed361: Merge "Fix build from -Werror=maybe-uninitialized."
* commit 'f741fc00374b4fd571c1c5e993627ed9ab6e6a3b':
  Fix build from -Werror=maybe-uninitialized.
2015-03-10 22:04:37 +00:00
Dan Albert 712455dd87 Fix build from -Werror=maybe-uninitialized.
This won't actually ever be uninitialized because the code will take a
failure path if the code that initializes it fails. The goto seems to
thwart this check though.

Not sure why this is only firing on userdebug builds yet. I'll look in
to it tomorrow.

Change-Id: Ie9d837d6baea255d2a4d169355b53dfd775eacce
(cherry picked from commit 83ca56ac98)
2015-03-10 14:00:52 -07:00
Rom Lemarchand cbcbea27c7 Parse boot properties from device tree
- Make sure compatible DT node is "android,firmware"
- Set ro.boot.* properties from firmware/android/ DT node

Change-Id: If3d0716831516cb3d3fde1f75d57e2691d42d054
2015-03-10 13:28:48 -07:00
Dan Albert 05c9f698f2 am a4b8819e: am 3f411357: am 5f2ccb0e: Merge "Move adb to C++."
* commit 'a4b8819e165988adf5d5eb5b4a41b77ccc6bf522':
  Move adb to C++.
2015-03-10 18:16:40 +00:00
Dan Albert 363a17eb66 am 8414ce2a: am ea998e0e: am 9b1fd969: Merge "Fix a writex transcription error."
* commit '8414ce2acefd8359a9c5dda75bce1c68d82a3731':
  Fix a writex transcription error.
2015-03-10 18:15:44 +00:00
Dan Albert 8f343ac8ae am 756cc397: am 8b09c276: am 332c2881: Merge "Make the root/unroot test more robust."
* commit '756cc39739a67610abaff3f2b72f6a15514f6ffc':
  Make the root/unroot test more robust.
2015-03-10 18:15:14 +00:00
Dimitry Ivanov 44ad0f9b1f am ddd97caf: am b27bd948: Merge "Generate gnu hash for arm only"
* commit 'ddd97cafb8d8383d341e609089013e7720f16f15':
  Generate gnu hash for arm only
2015-03-10 17:00:48 +00:00