Commit Graph

14125 Commits

Author SHA1 Message Date
Elliott Hughes dac7f85d16 am 3d671000: am 28693983: am 1a39a994: Merge "Correct magic number on umount2"
* commit '3d671000c7268fcfcaf5445734b88428af26c294':
  Correct magic number on umount2
2015-04-24 04:01:13 +00:00
Elliott Hughes 45a2329b2d am 77434ab3: am ef68fd3f: am d4656784: Merge "Make init re-exec itself for its SELinux domain transition."
* commit '77434ab362b3234accf16499aaf2a5340d568553':
  Make init re-exec itself for its SELinux domain transition.
2015-04-24 03:51:12 +00:00
Elliott Hughes 3d671000c7 am 28693983: am 1a39a994: Merge "Correct magic number on umount2"
* commit '28693983510b140240e7b3e83c082e516b83896f':
  Correct magic number on umount2
2015-04-24 03:39:31 +00:00
Elliott Hughes 77434ab362 am ef68fd3f: am d4656784: Merge "Make init re-exec itself for its SELinux domain transition."
* commit 'ef68fd3f807438fd9aae3b8f104f3a85ef9eb699':
  Make init re-exec itself for its SELinux domain transition.
2015-04-24 03:28:45 +00: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
Elliott Hughes 1a39a994d9 Merge "Correct magic number on umount2" 2015-04-24 03:21:43 +00:00
Elliott Hughes ef68fd3f80 am d4656784: Merge "Make init re-exec itself for its SELinux domain transition."
* commit 'd46567848bfcdc8f2cbc3faeef487cf5c770b43a':
  Make init re-exec itself for its SELinux domain transition.
2015-04-24 03:18:39 +00:00
Elliott Hughes d46567848b Merge "Make init re-exec itself for its SELinux domain transition." 2015-04-24 03:10:16 +00:00
William Roberts 4555b69f26 Correct magic number on umount2
The umount2 call was using the magic constant 2 which is
has a defined and proper macro in mount.h as MNT_DETATCH.

Change-Id: I4ca4a6d31cbf5495c545088e3d90a8894a9f912f
2015-04-24 01:13:35 +00:00
Mark Salyzyn 7076796cab am 44f1356e: am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd parse error"
* commit '44f1356e42a64fefb194b5c74b62402f4ec2881e':
  rootfs: init.rc start logd parse error
2015-04-23 23:16:39 +00:00
Mark Salyzyn 44f1356e42 am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd parse error"
* commit '85a9566f7c1b9bcef150edc587a3e64b1196ffc8':
  rootfs: init.rc start logd parse error
2015-04-23 22:45:50 +00:00
Mark Salyzyn 85a9566f7c am 76520752: Merge "rootfs: init.rc start logd parse error"
* commit '765207524fcbe261686c5d96bc42ea3dcc124f0a':
  rootfs: init.rc start logd parse error
2015-04-23 22:34:48 +00:00
Mark Salyzyn 2b70a6501f am 9277b011: am 9d4b3010: am 2ce1d81f: Merge "liblog: __android_log_is_loggable support Developer Options"
* commit '9277b01138decd65cd98cd4265789369cb9797b7':
  liblog: __android_log_is_loggable support Developer Options
2015-04-23 22:29:28 +00:00
Mark Salyzyn b259b5fb86 am ef9a093f: am 27660999: am 653f9581: Merge "logd: per UID less aggressive 12.5% threshold"
* commit 'ef9a093fddd989bc555485e169bc8cc8a2643a7e':
  logd: per UID less aggressive 12.5% threshold
2015-04-23 22:29:27 +00:00
Mark Salyzyn de9f330888 am 92391131: am f94727b4: am 40502e1a: Merge "logd: ratelimit drop messages to 1/sec"
* commit '92391131c43ec59d174d95ccfab6944832d1cee7':
  logd: ratelimit drop messages to 1/sec
2015-04-23 22:29:26 +00:00
Mark Salyzyn 765207524f Merge "rootfs: init.rc start logd parse error" 2015-04-23 22:25:30 +00:00
Elliott Hughes adf0d1bbfa Make init re-exec itself for its SELinux domain transition.
Change-Id: I38adabe5789d671e3f7d21936071a758ec8cea8a
2015-04-23 15:20:51 -07:00
Mark Salyzyn 9277b01138 am 9d4b3010: am 2ce1d81f: Merge "liblog: __android_log_is_loggable support Developer Options"
* commit '9d4b3010b5b8c9e6c155df2ec1da4a33992a1ebd':
  liblog: __android_log_is_loggable support Developer Options
2015-04-23 21:27:59 +00:00
Mark Salyzyn 9d4b3010b5 am 2ce1d81f: Merge "liblog: __android_log_is_loggable support Developer Options"
* commit '2ce1d81fd412657c14a14dd43ec570ac65cc1874':
  liblog: __android_log_is_loggable support Developer Options
2015-04-23 21:16:40 +00:00
Mark Salyzyn 2ce1d81fd4 Merge "liblog: __android_log_is_loggable support Developer Options" 2015-04-23 21:06:31 +00:00
Mark Salyzyn ef9a093fdd am 27660999: am 653f9581: Merge "logd: per UID less aggressive 12.5% threshold"
* commit '2766099959799434b114f6272107df04f55493d8':
  logd: per UID less aggressive 12.5% threshold
2015-04-23 15:01:07 +00:00
Mark Salyzyn 92391131c4 am f94727b4: am 40502e1a: Merge "logd: ratelimit drop messages to 1/sec"
* commit 'f94727b4c6b10be576e145415bd6493a5e81c4a1':
  logd: ratelimit drop messages to 1/sec
2015-04-23 14:51:26 +00:00
Mark Salyzyn 2766099959 am 653f9581: Merge "logd: per UID less aggressive 12.5% threshold"
* commit '653f9581bf32cc2532c2b1d442d7bb2bbf0c173e':
  logd: per UID less aggressive 12.5% threshold
2015-04-23 14:50:42 +00:00
Mark Salyzyn 653f9581bf Merge "logd: per UID less aggressive 12.5% threshold" 2015-04-23 14:41:48 +00:00
Mark Salyzyn f94727b4c6 am 40502e1a: Merge "logd: ratelimit drop messages to 1/sec"
* commit '40502e1a70a0705ee9fbc50951bfae3c6b662632':
  logd: ratelimit drop messages to 1/sec
2015-04-23 14:38:52 +00:00
Mark Salyzyn 40502e1a70 Merge "logd: ratelimit drop messages to 1/sec" 2015-04-23 14:30:44 +00:00
Elliott Hughes 81bb3cb0f5 am 8a457c79: am d1eec0de: am 876881b2: Merge "Add missing null checks after allocations."
* commit '8a457c79276c65d1cc30fea929916986756a00b7':
  Add missing null checks after allocations.
2015-04-23 00:56:33 +00:00
Elliott Hughes 8a457c7927 am d1eec0de: am 876881b2: Merge "Add missing null checks after allocations."
* commit 'd1eec0de6a4af9565673809eb3cf29a1eefdcdb8':
  Add missing null checks after allocations.
2015-04-22 20:28:56 +00:00
Elliott Hughes d1eec0de6a am 876881b2: Merge "Add missing null checks after allocations."
* commit '876881b22ad5d735cdb3ae2ac1afa6c336378808':
  Add missing null checks after allocations.
2015-04-22 20:17:35 +00:00
Elliott Hughes 876881b22a Merge "Add missing null checks after allocations." 2015-04-22 20:05:46 +00:00
Mark Salyzyn e06a6e0f26 logd: ratelimit drop messages to 1/sec
Bug: 20334069
Bug: 20370119
Change-Id: I6f850aec46c4df1c99a5b1f28db75d071e134ad5
2015-04-22 11:58:37 -07:00
Mark Salyzyn d717d805d4 logd: per UID less aggressive 12.5% threshold
Per-UID quota has a threshold of 12.5% of the total log size.
If less than that space is taken by the UID, then we
will not engage the pruning based on worst UID.

Change-Id: I9f15c9a26938f1115eb75e9c28ddb073e7680e06
2015-04-22 11:53:29 -07:00
Mark Salyzyn 1f028b2fdf liblog: __android_log_is_loggable support Developer Options
- If logd.tag.<tag> is not found, check if persist.logd.tag.<tag> is available
- Do not turn off the isLoggable functionality on "user" builds

Bug: 19544788
Bug: 17760225
Change-Id: I3fec67b547aa431438965519507033798398e1e1
2015-04-22 10:39:39 -07:00
Richard Uhler e7eba774d8 am b1e5d2e3: am 68f3a5a0: am f75f16a1: Merge "Fix typos in comments"
* commit 'b1e5d2e386d2738ce9415d349f2a71945830d0a6':
  Fix typos in comments
2015-04-22 16:54:35 +00:00
Richard Uhler b1e5d2e386 am 68f3a5a0: am f75f16a1: Merge "Fix typos in comments"
* commit '68f3a5a09f26831b85bfdc664fa4172a5135579e':
  Fix typos in comments
2015-04-22 16:29:42 +00:00
Richard Uhler 68f3a5a09f am f75f16a1: Merge "Fix typos in comments"
* commit 'f75f16a1ddbe6cde5e44036d48dc7a6c62d38cc0':
  Fix typos in comments
2015-04-22 16:17:31 +00:00
Richard Uhler f75f16a1dd Merge "Fix typos in comments" 2015-04-22 16:07:22 +00:00
Elliott Hughes 9e2d8b47c8 am f91c0664: am 421d01c8: am d4196ef8: Merge "Add a command to call libnetutils\' do_dhcp."
* commit 'f91c06646ed836c25aeacc4332851c53cd1e0861':
  Add a command to call libnetutils' do_dhcp.
2015-04-22 03:32:13 +00:00
Elliott Hughes f91c06646e am 421d01c8: am d4196ef8: Merge "Add a command to call libnetutils\' do_dhcp."
* commit '421d01c89500ddb71c976b20aa023b5d2fd9ccf0':
  Add a command to call libnetutils' do_dhcp.
2015-04-22 03:09:21 +00:00
Elliott Hughes 421d01c895 am d4196ef8: Merge "Add a command to call libnetutils\' do_dhcp."
* commit 'd4196ef88757a87af41c0f7ee6ed7bfc3802c9c7':
  Add a command to call libnetutils' do_dhcp.
2015-04-22 02:57:58 +00:00
Elliott Hughes d4196ef887 Merge "Add a command to call libnetutils' do_dhcp." 2015-04-22 02:50:13 +00:00
Elliott Hughes dc3b459ff9 Add missing null checks after allocations.
Bug: http://b/20317729
Change-Id: I62bb761d48ee59a1f4ddd0cdd0632432305ca2ca
2015-04-21 19:43:22 -07:00
Elliott Hughes 9ab372eb22 Add a command to call libnetutils' do_dhcp.
Useful for wifi bringup.

Change-Id: Ib1d1b1d15cb9ce57119457a780e169b8f98987c2
2015-04-21 19:31:43 -07:00
Elliott Hughes 93e7998be3 am c8ecbc8a: am 99355ffb: am 0fb33b3c: Merge "Plumb more of the error reporting through."
* commit 'c8ecbc8aa80117bf9eb884fc70b19ab7abc55146':
  Plumb more of the error reporting through.
2015-04-22 02:13:48 +00:00
Elliott Hughes c8ecbc8aa8 am 99355ffb: am 0fb33b3c: Merge "Plumb more of the error reporting through."
* commit '99355ffbdf1bdd097ee1e484d61b1dbb8596276e':
  Plumb more of the error reporting through.
2015-04-22 01:39:56 +00:00
Elliott Hughes 99355ffbdf am 0fb33b3c: Merge "Plumb more of the error reporting through."
* commit '0fb33b3c05a0c935e17ae93dbe474f816cec666b':
  Plumb more of the error reporting through.
2015-04-22 01:27:36 +00:00
Elliott Hughes 0fb33b3c05 Merge "Plumb more of the error reporting through." 2015-04-22 01:20:36 +00:00
Elliott Hughes 1555147bc4 Plumb more of the error reporting through.
This doesn't fix the bug, but it does flatten the bug to the well-known
and long-standing "adb shell" doesn't return exit statuses, so when we
fix that, this one will fix itself.

Bug: http://b/20423886
Change-Id: I48351e46f05dd3f2f6e57f0df1d851333458d0ef
2015-04-21 17:58:55 -07:00
Elliott Hughes 987f7ade92 am 59f01128: am 14000a3a: am 9a0cea92: Merge "Add a couple more adb shell regression tests."
* commit '59f01128982356ccbe4d1d302bb568a08d3e4795':
  Add a couple more adb shell regression tests.
2015-04-22 00:17:44 +00:00
Elliott Hughes 59f0112898 am 14000a3a: am 9a0cea92: Merge "Add a couple more adb shell regression tests."
* commit '14000a3a35d42815a95dce63b40f71e5a6cb9128':
  Add a couple more adb shell regression tests.
2015-04-21 23:52:48 +00:00