Commit graph

7691 commits

Author SHA1 Message Date
Mark Salyzyn
4f7e54f32d am fe545b9c: am 0516aded: Merge "logd: libsysutils: logd startup outside init environment"
* commit 'fe545b9cb7188036d5fe8c433c7c87dd1b364c2b':
  logd: libsysutils: logd startup outside init environment
2014-04-17 23:22:37 +00:00
Mark Salyzyn
2898a4ad5e am 7fb0ff53: am 25f07f77: Merge changes I487ebe67,Ie7a0aeb2
* commit '7fb0ff53e87115d98af7272368348bbc270516ae':
  libutils: FileMap styling adjustments
  libutils: FileMap 64 bit compile issues
2014-04-17 23:22:28 +00:00
Mark Salyzyn
fe545b9cb7 am 0516aded: Merge "logd: libsysutils: logd startup outside init environment"
* commit '0516aded0e3006272ec390fd418d311e06b1d328':
  logd: libsysutils: logd startup outside init environment
2014-04-17 23:16:38 +00:00
Mark Salyzyn
0516aded0e Merge "logd: libsysutils: logd startup outside init environment" 2014-04-17 23:11:40 +00:00
Mark Salyzyn
7fb0ff53e8 am 25f07f77: Merge changes I487ebe67,Ie7a0aeb2
* commit '25f07f77eceba32a5085a6ff9b70081352d3fdb9':
  libutils: FileMap styling adjustments
  libutils: FileMap 64 bit compile issues
2014-04-17 20:52:30 +00:00
Mark Salyzyn
25f07f77ec Merge changes I487ebe67,Ie7a0aeb2
* changes:
  libutils: FileMap styling adjustments
  libutils: FileMap 64 bit compile issues
2014-04-17 20:47:38 +00:00
Mark Salyzyn
270abd6944 am ca242b49: am 280b7d40: Merge "libutils: BlobCache 64 bit compile issues"
* commit 'ca242b497daa152f517f2b74037d5e2765f3ad2d':
  libutils: BlobCache 64 bit compile issues
2014-04-17 17:07:44 +00:00
Mark Salyzyn
ca242b497d am 280b7d40: Merge "libutils: BlobCache 64 bit compile issues"
* commit '280b7d40f5d0478bf92470f1d6b0bce917712dcc':
  libutils: BlobCache 64 bit compile issues
2014-04-17 17:02:24 +00:00
Mark Salyzyn
b618576ff1 libutils: FileMap styling adjustments
Change-Id: I487ebe67a46a7b8f680e722141dd216bbd396f3e
2014-04-17 10:02:15 -07:00
Mark Salyzyn
15085a6a2c libutils: FileMap 64 bit compile issues
Change-Id: Ie7a0aeb2a7e2d2a90aa2b97c657ea7ec566bf793
2014-04-17 09:43:36 -07:00
Mark Salyzyn
280b7d40f5 Merge "libutils: BlobCache 64 bit compile issues" 2014-04-17 16:42:32 +00:00
Mark Salyzyn
dfc47e8685 logd: libsysutils: logd startup outside init environment
Change-Id: I3426b6c3eebdd0c8258e966dcaaaa2825d7a23d1
2014-04-17 16:14:24 +00:00
Mark Salyzyn
387c561300 libutils: BlobCache 64 bit compile issues
Change-Id: I60e9bddfff04f19834b83bdc26a83ca7173363c3
2014-04-17 08:32:11 -07:00
Mark Salyzyn
f00a30e54e am 6a044d46: am 26bb9970: Merge "logd: Add logd_test"
* commit '6a044d4614d9e91347d83707c2751dcfa2b32cbd':
  logd: Add logd_test
2014-04-15 23:24:20 +00:00
Mark Salyzyn
6a044d4614 am 26bb9970: Merge "logd: Add logd_test"
* commit '26bb9970c463eb1209803d833799f128484864ac':
  logd: Add logd_test
2014-04-15 23:21:59 +00:00
Mark Salyzyn
26bb9970c4 Merge "logd: Add logd_test" 2014-04-15 23:17:34 +00:00
Christopher Ferris
34a7371635 am 049b8ab1: am 64e71a7c: Merge "Avoid logging functions from signal handler."
* commit '049b8ab1cae5f420c079905c95a5bdd107404253':
  Avoid logging functions from signal handler.
2014-04-15 21:28:24 +00:00
Christopher Ferris
049b8ab1ca am 64e71a7c: Merge "Avoid logging functions from signal handler."
* commit '64e71a7c2efb5783744335e8df45e5da152a65da':
  Avoid logging functions from signal handler.
2014-04-15 21:23:08 +00:00
Christopher Ferris
64e71a7c2e Merge "Avoid logging functions from signal handler." 2014-04-15 21:20:11 +00:00
Jeff Brown
83ec001086 am a77bef47: Document the adb install -d option.
* commit 'a77bef47decf2c0818397aced983999e235aa82f':
  Document the adb install -d option.
2014-04-15 20:36:55 +00:00
Jeff Brown
a77bef47de Document the adb install -d option.
Change-Id: Ife0da42c22e4408dc5c07ac0f20e0ecbbde20832
2014-04-15 13:34:04 -07:00
Christopher Ferris
17224d57fb Avoid logging functions from signal handler.
(cherry picked from commit 9007677fcb)

Change-Id: Ic0163f43308c6a281ab3757d90933e5127843fed
2014-04-15 12:18:44 -07:00
Mark Salyzyn
d3ba665020 logd: Add logd_test
* Test statistics output, all four main log id types
  are checked to be present, and output is properly
  formatted with header (ascii new-line terminated
  byte count) and trailer (newline formfeed) frames.
* On dev build test dgram_qlen, circumvent if
  liblog benchmarks executed first though.
* Test if kernel and user space loggers are
  present, and if any content has leaked to both.
* test benchmark and use it to verify worst UID pruning

Change-Id: I890c89f64825956f40108de806ed750b0170ac6c
2014-04-15 10:21:57 -07:00
Narayan Kamath
48030e68e5 am e7ddcad8: am 0f4575db: Merge "HAVE_POSIX_CLOCKS doesn\'t imply CLOCK_BOOTTIME."
* commit 'e7ddcad89f2950d58b4022b55f2cf693daac2e19':
  HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.
2014-04-15 11:02:59 +00:00
Narayan Kamath
e7ddcad89f am 0f4575db: Merge "HAVE_POSIX_CLOCKS doesn\'t imply CLOCK_BOOTTIME."
* commit '0f4575dbbd6587023229c87bcd385557a96830ae':
  HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.
2014-04-15 10:59:23 +00:00
Narayan Kamath
0f4575dbbd Merge "HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME." 2014-04-15 10:56:26 +00:00
Narayan Kamath
c5aff68693 am cda31324: am 4706320e: Merge "Include 64bit valgrind in the android_filesystem_config."
* commit 'cda31324afdc3e9d1bc5d2e9ee45985cf1fb8819':
  Include 64bit valgrind in the android_filesystem_config.
2014-04-14 16:01:31 +00:00
Narayan Kamath
cda31324af am 4706320e: Merge "Include 64bit valgrind in the android_filesystem_config."
* commit '4706320eb30812b301675b15a35036190a1c87b6':
  Include 64bit valgrind in the android_filesystem_config.
2014-04-14 15:58:22 +00:00
Narayan Kamath
4706320eb3 Merge "Include 64bit valgrind in the android_filesystem_config." 2014-04-14 15:56:37 +00:00
Colin Cross
8d57b79c26 am bf66e448: am a1551e9b: Merge "Fix buffer overflow in syren utility"
* commit 'bf66e4486d1ded51da45d69548e138ab7a75967d':
  Fix buffer overflow in syren utility
2014-04-13 18:09:35 +00:00
Colin Cross
bf66e4486d am a1551e9b: Merge "Fix buffer overflow in syren utility"
* commit 'a1551e9b4c586d654224810100f15e8a46c64a7e':
  Fix buffer overflow in syren utility
2014-04-13 18:06:52 +00:00
Colin Cross
a1551e9b4c Merge "Fix buffer overflow in syren utility" 2014-04-13 18:04:23 +00:00
nks
3967f81b56 Fix buffer overflow in syren utility
Patch for https://code.google.com/p/android/issues/detail?id=68268

A length check for the argv[2] was added in order to prevent buffer
overflow.  Also replace strcpy with strlcpy.

Signed-off-by: nks <nks@sixserv.org>
Change-Id: If65b83e9b658315c672e684f64e3ae00e69fac31
2014-04-13 10:45:30 -07:00
Narayan Kamath
6b7ab90ca9 Include 64bit valgrind in the android_filesystem_config.
Required so that we set the exectuable bit correctly.

Change-Id: If59bd0ff47d2b4b2b8f92a1c007b4ba414ea1876
2014-04-12 09:11:16 +01:00
Sasha Levitskiy
43cb7ae6c3 am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."
* commit '4f362e438c6ee5688c4f2f444203ed7acffa566b':
  Cleanup: warning fixit.
2014-04-12 00:00:02 +00:00
Sasha Levitskiy
4f362e438c am 835526fd: Merge "Cleanup: warning fixit."
* commit '835526fdc035cad6d712a7098d0eae37b3995d2c':
  Cleanup: warning fixit.
2014-04-11 23:57:21 +00:00
Sasha Levitskiy
835526fdc0 Merge "Cleanup: warning fixit." 2014-04-11 23:54:05 +00:00
Ben Cheng
7acecec433 am 3c29e66e: am 2f365509: Merge "Fix signed vs unsigned comparison."
* commit '3c29e66eaa683fcd1412f618f9da1e7c2e2b52aa':
  Fix signed vs unsigned comparison.
2014-04-11 23:34:59 +00:00
Ben Cheng
3c29e66eaa am 2f365509: Merge "Fix signed vs unsigned comparison."
* commit '2f365509eb8a3696feb8063ba8e17ebd12beb7ff':
  Fix signed vs unsigned comparison.
2014-04-11 23:31:24 +00:00
Ben Cheng
2f365509eb Merge "Fix signed vs unsigned comparison." 2014-04-11 23:28:08 +00:00
Ben Cheng
1bafa52172 Fix signed vs unsigned comparison.
Change-Id: I4011607858f3a82acc04509c9f795f960496ed69
2014-04-11 16:27:30 -07:00
Sasha Levitskiy
cdc1cfb3e5 Cleanup: warning fixit.
bootable/recovery has a dependent commit: I9adb470b04e4301989d128c9c3097b21b4dea431

Change-Id: Icf23e659265d71d5226d527c2b40cfbc132320ee
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-11 16:15:46 -07:00
Mark Salyzyn
3559d98c26 am eef9f1da: am ba419940: Merge "logcat: Better help message for white and black list"
* commit 'eef9f1da0b93e542aa25c5db6e5041609aaff77d':
  logcat: Better help message for white and black list
2014-04-11 21:41:06 +00:00
Mark Salyzyn
eef9f1da0b am ba419940: Merge "logcat: Better help message for white and black list"
* commit 'ba419940f75d93ac4aacef695da0570b1591f140':
  logcat: Better help message for white and black list
2014-04-11 21:37:40 +00:00
Mark Salyzyn
ba419940f7 Merge "logcat: Better help message for white and black list" 2014-04-11 21:34:09 +00:00
Mark Salyzyn
bbbe14f758 logcat: Better help message for white and black list
Change-Id: Ia739260b4e0fcf8062ad9166fd65b1d6e7bb446c
2014-04-11 13:49:43 -07:00
Narayan Kamath
d85efaa068 am a73f7e92: am 822b1a02: Merge "Add a config for dual mode zygote."
* commit 'a73f7e924abb8e7b1aa3f0d64d0177ce7d1c58e6':
  Add a config for dual mode zygote.
2014-04-11 09:57:24 +00:00
Narayan Kamath
a73f7e924a am 822b1a02: Merge "Add a config for dual mode zygote."
* commit '822b1a024d058641be9aefa14da794f09755ce35':
  Add a config for dual mode zygote.
2014-04-11 08:42:02 +00:00
Narayan Kamath
822b1a024d Merge "Add a config for dual mode zygote." 2014-04-11 08:22:38 +00:00
Narayan Kamath
ea659643ee HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.
HAVE_POSIX_CLOCKS imples clock_gettime,settime and
CLOCK_REALTIME / CLOCK_MONOTONIC.

CLOCK_BOOTTIME appears only on newer versions of glibc
and might only be supported on newer kernels.

Change-Id: I66e724a3593538c3b80de2c5f81a964d3fa96eaf
2014-04-10 20:19:20 +01:00