Commit Graph

19633 Commits

Author SHA1 Message Date
Mark Salyzyn 03302be6e9 Merge "logcat: build cleanup"
am: 9dead6deec

* commit '9dead6deec6d97214e16ae931900879a797ffea3':
  logcat: build cleanup
2016-02-04 21:45:33 +00:00
Mark Salyzyn 9dead6deec Merge "logcat: build cleanup" 2016-02-04 21:40:16 +00:00
Mark Salyzyn 5b89b49fc9 logcat: build cleanup
LOCAL_MODULE_TAGS debug encompasses eng

Bug: 26976972
Change-Id: I44b30f2ebb0173b203bf975f01dfead737b4e5bf
2016-02-04 13:10:19 -08:00
Mark Salyzyn 9bc3b93c6a Merge "logcatd.rc: only deliver on eng and userdebug"
am: 11aebd8c9a

* commit '11aebd8c9a69bda7eb1ae47263ebd4f879e2b761':
  logcatd.rc: only deliver on eng and userdebug
2016-02-04 20:36:32 +00:00
Mark Salyzyn 11aebd8c9a Merge "logcatd.rc: only deliver on eng and userdebug" 2016-02-04 20:33:20 +00:00
Mark Salyzyn 6de62e52c7 logcatd.rc: only deliver on eng and userdebug
Change-Id: I694d33a041e40fe181d3c2f1c8604765ba29e709
2016-02-04 11:11:52 -08:00
Josh Gao 4b09d2f084 Merge "adb: don\'t append a slash to a path that already ends with one."
am: aae1eb2c4f

* commit 'aae1eb2c4f10f3d2c49455eb37c4ae4b38ffa47d':
  adb: don't append a slash to a path that already ends with one.
2016-02-04 00:42:53 +00:00
Josh Gao aae1eb2c4f Merge "adb: don't append a slash to a path that already ends with one." 2016-02-04 00:36:32 +00:00
Elliott Hughes 89df186cda Merge "adb: win32: fix start-server to properly display UTF-8 on the console"
am: 1617dd4fe9

* commit '1617dd4fe96d8578a808a9cef9e75f763446ff32':
  adb: win32: fix start-server to properly display UTF-8 on the console
2016-02-04 00:31:40 +00:00
Elliott Hughes 1617dd4fe9 Merge "adb: win32: fix start-server to properly display UTF-8 on the console" 2016-02-04 00:26:36 +00:00
Spencer Low 53a0a99fe8 adb: win32: fix start-server to properly display UTF-8 on the console
fwrite() is a macro that maps to adb_fwrite(), which can write UTF-8 to
the console. Use it to write the output that comes from the subprocess
adb server.

To do this, dup the stdout/stderr file descriptor and make a duplicate
FILE* stream, in binary mode (since we're reading raw bytes from the
subprocess), and unbuffered.

Change-Id: I480761bae0bd576dc9e03fa4d31266f4e49635ed
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2016-02-03 16:24:37 -08:00
Josh Gao 323899b6d3 adb: don't append a slash to a path that already ends with one.
Bug: http://b/26964908
Change-Id: I1fbd752fd97f5414a306b46f7bfce3373362f8b3
2016-02-03 16:24:13 -08:00
Elliott Hughes a902887970 Merge "Add support for USB_HVDCP chargers"
am: ba3014c914

* commit 'ba3014c914eb65911b3bb367a1b8e02705ecf398':
  Add support for USB_HVDCP chargers
2016-02-04 00:12:06 +00:00
Elliott Hughes ba3014c914 Merge "Add support for USB_HVDCP chargers" 2016-02-04 00:08:33 +00:00
Josh Gao 046bf3b212 Merge "adb: report subprocess creation errors to the client."
am: 7aa7a81eb1

* commit '7aa7a81eb1f56731cec1fd04623e8b4acada2039':
  adb: report subprocess creation errors to the client.
2016-02-03 23:57:36 +00:00
Josh Gao f2610942ef Merge "adb: fix mistaken uses of SendFail in file_sync_service.cpp."
am: 2d2185ee09

* commit '2d2185ee09d28779e0083aca00b51c5903baf961':
  adb: fix mistaken uses of SendFail in file_sync_service.cpp.
2016-02-03 23:55:19 +00:00
Josh Gao 7aa7a81eb1 Merge "adb: report subprocess creation errors to the client." 2016-02-03 23:53:26 +00:00
Josh Gao 4323507a7e adb: report subprocess creation errors to the client.
Bug: http://b/26589627
Change-Id: I38e7a33ea8274f0eb47dc0ed87fcbca08a0ab22a
2016-02-03 15:52:07 -08:00
Josh Gao 2d2185ee09 Merge "adb: fix mistaken uses of SendFail in file_sync_service.cpp." 2016-02-03 23:51:44 +00:00
Josh Gao 6ad06b9ea9 adb: fix mistaken uses of SendFail in file_sync_service.cpp.
SendFail and SendSyncFail are similarly named, and have the same
prototype. Use `#pragma GCC poison` to prevent use of SendFail in
file_sync_service.cpp, and fix the places where it was used
accidentally.

Change-Id: I6b9a7e565b76dfab10f8ae38f889d046ad80a403
2016-02-03 23:50:32 +00:00
Mark Salyzyn ba6523a449 Merge "libcutils: ashmem print error message for invalid fd"
am: 9c551a1bec

* commit '9c551a1bece6624bdbdfca40badc07b40b28ec1c':
  libcutils: ashmem print error message for invalid fd
2016-02-03 23:35:23 +00:00
Mark Salyzyn c1003c78b7 Merge "libcutils: ashmem check fd validity"
am: 1a84f47794

* commit '1a84f47794168e80975eae31c665d03367929f66':
  libcutils: ashmem check fd validity
2016-02-03 23:35:10 +00:00
Mark Salyzyn 9c551a1bec Merge "libcutils: ashmem print error message for invalid fd" 2016-02-03 23:30:29 +00:00
Mark Salyzyn 1a84f47794 Merge "libcutils: ashmem check fd validity" 2016-02-03 23:30:06 +00:00
Elliott Hughes 0f242b2dbf Merge "Fix the version number in the fastboot documentation."
am: 80e88a1274

* commit '80e88a12748dbae715adcd5fed79b7774b723f92':
  Fix the version number in the fastboot documentation.
2016-02-03 23:18:10 +00:00
Elliott Hughes 80e88a1274 Merge "Fix the version number in the fastboot documentation." 2016-02-03 23:10:46 +00:00
Mark Salyzyn e37111d751 libcutils: ashmem print error message for invalid fd
NB: We decided to not sniff for the constant saved __ashmem_rdev in
the early error path; requiring either the use of atomic operations,
or acquiring a lock to do it correctly. The heroics are not worth it.

Bug: 26871259
Change-Id: I46249838850ae32063eb5b7d08c731c5bb0fbf6b
2016-02-03 15:06:45 -08:00
Elliott Hughes d505cd8db2 Fix the version number in the fastboot documentation.
Bug: https://code.google.com/p/android/issues/detail?id=65414
Change-Id: Ia52101f7c8d59e79583fd9658e001648ff545c66
2016-02-03 14:30:01 -08:00
David Pursell 6e2adac0c7 Merge "fastboot: add TCP protocol."
am: 80dc9d8584

* commit '80dc9d85849b681280f963bc952f5f41c6dbfe59':
  fastboot: add TCP protocol.
2016-02-03 22:04:23 +00:00
David Pursell 80dc9d8584 Merge "fastboot: add TCP protocol." 2016-02-03 21:59:31 +00:00
David Pursell 2ec418a4c9 fastboot: add TCP protocol.
This CL implements a TCP protocol for use with fastboot. Protocol
description is given in fastboot_protocol.txt, some examples of
expected behavior can also be found in tcp_test.cpp.

Usage is:
  fastboot -s tcp:<hostname>[:port] <command>

Bug: http://b/26558551
Change-Id: If53a514a534489c617db32c4fea8819949121282
2016-02-03 13:57:45 -08:00
Colin Cross b6ad690e17 Merge "liblog: remove strdup from logging calls"
am: a2dd73424f

* commit 'a2dd73424f17c09e6a4482f085b40fddc6de83b3':
  liblog: remove strdup from logging calls
2016-02-03 21:53:40 +00:00
Colin Cross a2dd73424f Merge "liblog: remove strdup from logging calls" 2016-02-03 21:48:37 +00:00
Mark Salyzyn 1186f3a5ad libcutils: ashmem check fd validity
- collect st_rdev on open, or when required, for /dev/ashmem.
- check in all cases if fd is a character device and matches rdev.
- requires that we have open, read and write access to /dev/ashmem
  to check, assumption being that if we can not, then we have no
  right playing with the associated misdirected file descriptor.

NB: ashmem libcutil library entry points can no longer be called in
    signal context.

Bug: 26871259
Change-Id: I9a17e33317a9be795131473a51c16f761b5f7407
2016-02-03 13:05:22 -08:00
Steve Fung b4111adeea Merge "crash_reporter: Fix paths for kernel panic collection"
am: da1a9a277d

* commit 'da1a9a277d6331d7663d7b0f68e1fd296950d499':
  crash_reporter: Fix paths for kernel panic collection
2016-02-03 20:34:18 +00:00
Steve Fung da1a9a277d Merge "crash_reporter: Fix paths for kernel panic collection" 2016-02-03 20:30:58 +00:00
David Pursell 91b4e68738 Merge "fastboot: fix SocketMock send failures."
am: e54ea1c12d

* commit 'e54ea1c12d7d793dceff2f8afdb9bf6461462d92':
  fastboot: fix SocketMock send failures.
2016-02-03 18:58:00 +00:00
David Pursell e54ea1c12d Merge "fastboot: fix SocketMock send failures." 2016-02-03 18:54:27 +00:00
David Pursell 2c094f7983 fastboot: fix SocketMock send failures.
Fixes SocketMock::ExpectSendFailure() to allow unit testing of errors
during send, and adds tests for ExpectSendFailure() and
AddReceiveFailure().

Also adds missing tests to make sure ReceiveAll() continues to read
until failure or all bytes have been read.

Bug: http://b/26157893
Change-Id: I67e7d6de8e8ec4a3b62a6b7d7217f7530862edf7
2016-02-03 10:43:01 -08:00
David Pursell ef0e01c346 Merge "libcutils/fastboot: improve multi-buffer write."
am: f6f800ef3c

* commit 'f6f800ef3c4f7caef65f75bd6365a2045be488ea':
  libcutils/fastboot: improve multi-buffer write.
2016-02-03 18:09:24 +00:00
David Pursell f6f800ef3c Merge "libcutils/fastboot: improve multi-buffer write." 2016-02-03 18:03:00 +00:00
David Pursell b34e4a06ee libcutils/fastboot: improve multi-buffer write.
Fixes libcutils multi-buffer write interface to be more friendly and
hooks into it from the fastboot Socket class.

Bug: http://b/26558551
Change-Id: Ibb3a8428fc379755602de52722c1260f9e345bc0
2016-02-03 10:01:38 -08:00
Mark Salyzyn d8e0e52099 Merge "init.rc: too many start logd"
am: 989daeaf5b

* commit '989daeaf5b2f50d96da69ad476adf434522e35e7':
  init.rc: too many start logd
2016-02-03 15:51:31 +00:00
Mark Salyzyn 989daeaf5b Merge "init.rc: too many start logd" 2016-02-03 15:24:32 +00:00
Johan Redestig 3282861b68 Add support for USB_HVDCP chargers
and print a warning message containing the type
when the battery monitor fails to recognize a power supply.

Change-Id: I02ebd89736f7444f8bf7f28550afeec82d57e107
2016-02-03 13:45:54 +01:00
Steve Fung 2bedc74553 crash_reporter: Fix paths for kernel panic collection
Fix the paths to the pstore mount and run data within
the kernel collector.

BUG=26774830

Change-Id: I68be0a28201cb73c3420166b2f4da77a1e586ca2
2016-02-02 16:14:52 -08:00
Mark Salyzyn 0604f6fbae init.rc: too many start logd
Bug: 26934873
Change-Id: Ia00da6253a50bedc8ba825df1cf641b86cdebeed
2016-02-02 16:01:17 -08:00
Elliott Hughes de0af89c82 Merge "init: Fix load_firmware error"
am: f330e5462d

* commit 'f330e5462d200080d1694834282afadc018060e1':
  init: Fix load_firmware error
2016-02-02 22:47:36 +00:00
Elliott Hughes f330e5462d Merge "init: Fix load_firmware error" 2016-02-02 22:44:01 +00:00
Colin Cross 7a106f7c12 liblog: remove strdup from logging calls
strdup to a static pointer is unnecessary, strlcpy into a static buffer
instead.  Avoids allocations in the ALOG* path, allowing liblog to be
used by libmemleak.

Change-Id: Ie0986da27c1fc5eb8ce4ebb076b513be8e1ee676
2016-02-02 13:55:42 -08:00