Commit graph

19546 commits

Author SHA1 Message Date
Josh Gao
831bd4f043 Merge changes I93287b87,I30a3eb0b
am: d18aea9974

* commit 'd18aea99746d9befed6d596521ea3aa10e07d23f':
  adb: add nullability specifiers to adb_client.h.
  adb: add adb_get_feature_set.
2016-02-01 18:52:06 +00:00
Josh Gao
d18aea9974 Merge changes I93287b87,I30a3eb0b
* changes:
  adb: add nullability specifiers to adb_client.h.
  adb: add adb_get_feature_set.
2016-02-01 18:48:13 +00:00
Josh Gao
a166e71e21 adb: add nullability specifiers to adb_client.h.
Change-Id: I93287b876cb06d871b4330d2733ef6f43c58fbbf
2016-01-31 19:22:04 -08:00
Josh Gao
f3f6a1d0d4 adb: add adb_get_feature_set.
Extract a feature set getter function from commandline.cpp.

Change-Id: I30a3eb0b060a88379e29be16264637816e378978
2016-01-31 19:12:26 -08:00
Yabin Cui
f79a5f513b Merge "base: add API to remove file if it exists."
am: aef26bb1a4

* commit 'aef26bb1a4adb953f6bbd5a7e01ca964ed3b386d':
  base: add API to remove file if it exists.
2016-01-30 04:31:10 +00:00
Yabin Cui
aef26bb1a4 Merge "base: add API to remove file if it exists." 2016-01-30 04:27:44 +00:00
Yabin Cui
b6e314aa86 base: add API to remove file if it exists.
It is a function needed in different places like uncrypt, simpleperf.

Bug: 26883096
Change-Id: I26f4f30e8367867a88272625f00858569fc8e950
2016-01-29 19:24:55 -08:00
David Pursell
4c0a6a1677 Merge "adb: fix subprocess termination for legacy shell."
am: a9352202dd

* commit 'a9352202dd52a404199fbdca160d9d2d0992cf63':
  adb: fix subprocess termination for legacy shell.
2016-01-29 22:18:44 +00:00
David Pursell
a9352202dd Merge "adb: fix subprocess termination for legacy shell." 2016-01-29 22:14:46 +00:00
Josh Gao
41b04cf896 Merge "adb: SIGWINCH support for Windows"
am: c1eb5ba0fb

* commit 'c1eb5ba0fb1414ef471eb9832d82e79ef85d0d89':
  adb: SIGWINCH support for Windows
2016-01-29 22:06:27 +00:00
Josh Gao
c1eb5ba0fb Merge "adb: SIGWINCH support for Windows" 2016-01-29 22:01:45 +00:00
Christopher Ferris
94f8442f2e Merge "Always have ps output to stdout at least one line."
am: 4602f2b77b

* commit '4602f2b77b6e8405c5c84e2f67749ba83ed39d6c':
  Always have ps output to stdout at least one line.
2016-01-29 19:14:29 +00:00
Christopher Ferris
4602f2b77b Merge "Always have ps output to stdout at least one line." 2016-01-29 19:11:17 +00:00
Alex Vakulenko
56636da1c8 Merge "metricsd: Removing brillo::Any from weaved\'s public APIs"
am: bade73d9b4

* commit 'bade73d9b4f5b24bb3a01558efc531bad6941014':
  metricsd: Removing brillo::Any from weaved's public APIs
2016-01-29 17:06:06 +00:00
Alex Vakulenko
bade73d9b4 Merge "metricsd: Removing brillo::Any from weaved's public APIs" 2016-01-29 17:01:05 +00:00
Spencer Low
2e02dc630f adb: SIGWINCH support for Windows
- Introduces unix_read_interruptible() which is like unix_read() except
  that it can return EINTR.

- The big idea is that the Windows ReadConsoleInput() API will return an
  event on window resize and then we return EINTR from
  unix_read_interruptible() just like Unix.

- Only handles horizontal resize since Windows doesn't seem to give an
  event for vertical resize when no special screen buffer is used. This
  should be sufficient for the primary use case of adb on Windows
  (people are not running vi in the first place).

Change-Id: Id8d1710b559834c8098f2d7fbecedf2d0ade4b88
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2016-01-28 23:01:56 -08:00
Christopher Ferris
78e08066f2 Always have ps output to stdout at least one line.
There is at least one app that assumes that you will always get at least
one line of output in stdout from ps.

To fix this, move error output to stdout, and move the check of whether
/proc can be opened until after the ps header is printed.

Bug: 26554285
Change-Id: I6d9342aafd5c6f728735507cdd87a48a8e0373ac
2016-01-28 16:08:08 -08:00
Dan Stoza
65823b7820 Merge "Name the pixel format and transform enums"
am: 53529ecacd

* commit '53529ecacdffbbffb5c9fbc4ab38103703dde32e':
  Name the pixel format and transform enums
2016-01-28 23:22:57 +00:00
Dan Stoza
53529ecacd Merge "Name the pixel format and transform enums" 2016-01-28 23:18:43 +00:00
Alex Vakulenko
eca14e3722 metricsd: Removing brillo::Any from weaved's public APIs
Weaved replaces brillo::Any with base::Value in its client library,
so need to update clients.

Also this removes last D-Bus dependencies from metrics_collector.

BUG: 26558300
Change-Id: I82d571d7e2bd17347daeb1b70f48ec05378894f0
2016-01-28 14:44:28 -08:00
Todd Poynor
4a129d5a45 Merge "healthd: BatteryPropertiesRegistrar binder service ref count fixup"
am: 36ba2fad01

* commit '36ba2fad014a1a0734a6e704e30677ee88640d3b':
  healthd: BatteryPropertiesRegistrar binder service ref count fixup
2016-01-28 21:16:24 +00:00
Todd Poynor
36ba2fad01 Merge "healthd: BatteryPropertiesRegistrar binder service ref count fixup" 2016-01-28 21:11:09 +00:00
Todd Poynor
e55356486f healthd: BatteryPropertiesRegistrar binder service ref count fixup
Call addService using a reference to a strong pointer to the service object,
such that the proper IBinder object is ref counted, instead of passing the
object's this pointer.

Bug: None
Change-Id: I72cac08c835a17b8cc263b2dc34864420b7a2841
2016-01-28 21:10:21 +00:00
Rubin Xu
e37103a375 Merge "ADB security logging"
am: 8dfe21eaad

* commit '8dfe21eaad739d297b34dbb1d2b9851d64a42dda':
  ADB security logging
2016-01-28 19:55:57 +00:00
Rubin Xu
8dfe21eaad Merge "ADB security logging" 2016-01-28 19:50:58 +00:00
David Pursell
57dd5ae1e3 adb: fix subprocess termination for legacy shell.
http://r.android.com/166419 changed `adb shell` behavior to not
allocate a remote PTY for non-interactive commands, but adbd relied on
having a PTY to properly terminate the subprocess.

One impact of this is that when using older versions of adb or passing
the -x flag, `adb screenrecord` wasn't properly terminating and closing
out the video file.

This CL restores the old behavior for legacy shell connections: always
use a PTY, but put it in raw mode if the client is doing local PTY
input/output processing itself.

Bug: http://b/26742824
Change-Id: I9ee630c0ff0d2d6a0db367387af7123deea79676
2016-01-27 17:13:41 -08:00
Calin Juravle
cf0d813e38 Merge "Revert "nativebrige: log code_cache access errors to stderr as well""
am: 8b999d894f

* commit '8b999d894fc29d5f1bede1c233fe28e944c28ce9':
  Revert "nativebrige: log code_cache access errors to stderr as well"
2016-01-27 18:02:32 +00:00
Calin Juravle
8b999d894f Merge "Revert "nativebrige: log code_cache access errors to stderr as well"" 2016-01-27 17:58:18 +00:00
Calin Juravle
5e11a2936b Revert "nativebrige: log code_cache access errors to stderr as well"
This reverts commit 6d5017803e.

Bug: 26675310

Change-Id: Id56b5e832c85f01fca0a2198499d24224c5a6878
2016-01-27 17:53:20 +00:00
Kevin Cernekee
54b47105ae Merge "ueventd.rc: Document the different rule formats for /dev and /sys nodes"
am: fa432b0e2f

* commit 'fa432b0e2f87e9a029ac0094e5bceaaff258368a':
  ueventd.rc: Document the different rule formats for /dev and /sys nodes
2016-01-26 23:48:43 +00:00
Kevin Cernekee
fa432b0e2f Merge "ueventd.rc: Document the different rule formats for /dev and /sys nodes" 2016-01-26 23:44:56 +00:00
Mark Salyzyn
2feb98eab3 Merge "liblog: check getgroups for AID_LOG for AID_LOG_SECURITY"
am: b5eb67ff23

* commit 'b5eb67ff237f6b0a68fe78a93e8e5d6b75a05a32':
  liblog: check getgroups for AID_LOG for AID_LOG_SECURITY
2016-01-26 23:13:12 +00:00
Mark Salyzyn
b5eb67ff23 Merge "liblog: check getgroups for AID_LOG for AID_LOG_SECURITY" 2016-01-26 22:54:47 +00:00
Mark Salyzyn
55045303f7 Merge "Revert "logd: security buffer only AID_SYSTEM reader""
am: c85ce9ba8e

* commit 'c85ce9ba8e97b77438624744d679947cf3f55043':
  Revert "logd: security buffer only AID_SYSTEM reader"
2016-01-26 22:44:39 +00:00
Mark Salyzyn
c85ce9ba8e Merge "Revert "logd: security buffer only AID_SYSTEM reader"" 2016-01-26 22:38:58 +00:00
Mark Salyzyn
674ce6ef58 Revert "logd: security buffer only AID_SYSTEM reader"
This reverts commit 756332e88b.

Change-Id: Ib8607ac758b7e88a9db716ec4274ec0e4e3dc596
2016-01-26 21:47:35 +00:00
James Hawkins
e4d688e27c Merge "bootstat: Hook up bootstat to record the boot complete signal and log boot events in the LOCAL_INIT_RC file, bootstat.rc."
am: dac84b5a1a

* commit 'dac84b5a1adf75fd81a7456faac7bf3953e8276a':
  bootstat: Hook up bootstat to record the boot complete signal and log boot events in the LOCAL_INIT_RC file, bootstat.rc.
2016-01-26 21:35:07 +00:00
Mark Salyzyn
9107c462ce liblog: check getgroups for AID_LOG for AID_LOG_SECURITY
Bug: 26792035
Change-Id: I634d3c8f9f3175956bd70e80daa479af40180f90
2016-01-26 13:32:02 -08:00
James Hawkins
dac84b5a1a Merge "bootstat: Hook up bootstat to record the boot complete signal and log boot events in the LOCAL_INIT_RC file, bootstat.rc." 2016-01-26 21:30:55 +00:00
Mark Salyzyn
c3dff7a5dc Merge "logd: security buffer only AID_SYSTEM reader"
am: 69ce7c5483

* commit '69ce7c5483709d2c005ae2c77f89b3c3835e8ba5':
  logd: security buffer only AID_SYSTEM reader
2016-01-26 20:48:13 +00:00
Mark Salyzyn
69ce7c5483 Merge "logd: security buffer only AID_SYSTEM reader" 2016-01-26 20:41:51 +00:00
James Hawkins
6bff639c19 bootstat: Hook up bootstat to record the boot complete signal and log
boot events in the LOCAL_INIT_RC file, bootstat.rc.

This change also creates the /data/misc/bootstat dir during the
filesystem creation block in init.rc.

Bug: 21724738
Change-Id: I2ad6913c0235d5f926c6ef8b3c65d650159c6ed7
2016-01-26 11:23:31 -08:00
Mark Salyzyn
756332e88b logd: security buffer only AID_SYSTEM reader
Bug: 26029733
Change-Id: I140e5eb8bb39271fa674744651127e3fc545cbe8
2016-01-26 07:20:29 -08:00
Alex Deymo
a64c980da9 Merge "Add BinPackArguments: false to .clang-format"
am: 1503538869

* commit '15035388694f92d84576aeeb0837e0d928250a59':
  Add BinPackArguments: false to .clang-format
2016-01-26 03:12:54 +00:00
Alex Deymo
1503538869 Merge "Add BinPackArguments: false to .clang-format" 2016-01-26 02:57:34 +00:00
Christopher Ferris
8296607568 Merge "Put BacktraceOffline code into a separate library."
am: 9adbf681a0

* commit '9adbf681a0780e2bb3e791fad82dcd555aeaca84':
  Put BacktraceOffline code into a separate library.
2016-01-26 01:57:00 +00:00
Christopher Ferris
9adbf681a0 Merge "Put BacktraceOffline code into a separate library." 2016-01-26 01:50:25 +00:00
Alex Deymo
d830612305 Add BinPackArguments: false to .clang-format
Without this setting, arguments passed to a function can be packed in
more than one line, with more than one argument per line.

For example, the following code will be formated as this without the
BinPackArguments:

  CallMyFunction(
    with_more_than_one, argument_per_line,
    event_they_dont_fit_in_a_single_line);

On the other hand, with BinPackArguments: false, that code will be
split in:
  CallMyFunction(
    with_more_than_one,
    argument_per_line,
    event_they_dont_fit_in_a_single_line);

or all the arguments in the same line if they all fit.

Bug: None
TEST=None

Change-Id: I48627e66e2a841f89418c0763e7fe6c3e6ea7387
2016-01-25 17:46:21 -08:00
Christopher Ferris
8540216028 Put BacktraceOffline code into a separate library.
BacktraceOffline is the only code that uses libLLVM. Create
a new shared library, backtrace_offline.so, that references this
so that including libbacktrace.so doesn't wind up pulling in libLLVM.

Change-Id: I90c502d833f6c464c3810dffde52a0c6da241cce
2016-01-25 16:26:48 -08:00
Mark Salyzyn
8ef22e432b Merge "logd: test wrap functionality"
am: 1c92d83cda

* commit '1c92d83cdaf78b4f9ef9069f7774851e77b327e7':
  logd: test wrap functionality
2016-01-25 22:48:51 +00:00