Commit Graph

21152 Commits

Author SHA1 Message Date
Yabin Cui 9efdfdb69f Merge "base: add API to remove file if it exists." am: aef26bb1a4
am: f79a5f513b

* commit 'f79a5f513bc97357316ea2cd3db1b7c1243f462a':
  base: add API to remove file if it exists.
2016-01-30 04:32:59 +00: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 7fd384bf77 Merge "adb: fix subprocess termination for legacy shell." am: a9352202dd
am: 4c0a6a1677

* commit '4c0a6a16772700146c4edb894af46f90138e9170':
  adb: fix subprocess termination for legacy shell.
2016-01-29 22:20:40 +00: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
Chris Tate 098a2badd7 Merge "Have init set up the backup stage dir on /cache" 2016-01-29 22:09:00 +00:00
Josh Gao f74da513c8 Merge "adb: SIGWINCH support for Windows" am: c1eb5ba0fb
am: 41b04cf896

* commit '41b04cf89677836dba14903226df5c7a3d39adcd':
  adb: SIGWINCH support for Windows
2016-01-29 22:08:22 +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 Tate 63c463fe28 Have init set up the backup stage dir on /cache
Bug 26834865

Change-Id: Idc63c1706f68d42b2a9cee05997c63a9bbcb0fb9
2016-01-29 12:47:46 -08:00
Christopher Ferris 4a906e5fb0 Merge "Always have ps output to stdout at least one line." am: 4602f2b77b
am: 94f8442f2e

* commit '94f8442f2e5196cfb38cc8e1d8908396fd9c3a35':
  Always have ps output to stdout at least one line.
2016-01-29 19:16:43 +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 03fbfef45e Merge "metricsd: Removing brillo::Any from weaved\'s public APIs" am: bade73d9b4
am: 56636da1c8

* commit '56636da1c85334b618a3e27d3e5523993c7cbc5d':
  metricsd: Removing brillo::Any from weaved's public APIs
2016-01-29 17:08:23 +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 c003b515e9 Merge "Name the pixel format and transform enums" am: 53529ecacd
am: 65823b7820

* commit '65823b78207f7636e4d7ad8a4104ed663336c159':
  Name the pixel format and transform enums
2016-01-28 23:25:38 +00: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 d054a9517c Merge "healthd: BatteryPropertiesRegistrar binder service ref count fixup" am: 36ba2fad01
am: 4a129d5a45

* commit '4a129d5a45241345934107cea3662fa72721d383':
  healthd: BatteryPropertiesRegistrar binder service ref count fixup
2016-01-28 21:38:32 +00: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 8c43666958 Merge "ADB security logging" am: 8dfe21eaad
am: e37103a375

* commit 'e37103a375de00d0300b49d2af3550db663f2f2e':
  ADB security logging
2016-01-28 20:07:13 +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
Chien-Yu Chen 113f88e365 Merge "Restart cameraserver" 2016-01-28 02:04:44 +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
Dimitry Ivanov 3bdb382bad Merge "Add libcamera2ndk.so to the list of public libraries" 2016-01-27 21:39:55 +00:00
Calin Juravle 6a8b22c03d Merge "Revert "nativebrige: log code_cache access errors to stderr as well"" am: 8b999d894f
am: cf0d813e38

* commit 'cf0d813e389da1577fb4249b18e189996f535a2f':
  Revert "nativebrige: log code_cache access errors to stderr as well"
2016-01-27 18:05:37 +00: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 89a31c4499 Merge "ueventd.rc: Document the different rule formats for /dev and /sys nodes" am: fa432b0e2f
am: 54b47105ae

* commit '54b47105aea0e93ee287f76d4a4dc6bfe6ddf698':
  ueventd.rc: Document the different rule formats for /dev and /sys nodes
2016-01-26 23:51:38 +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 bd09939e96 Merge "liblog: check getgroups for AID_LOG for AID_LOG_SECURITY" am: b5eb67ff23
am: 2feb98eab3

* commit '2feb98eab32b06e0806988901a6ad122e723533d':
  liblog: check getgroups for AID_LOG for AID_LOG_SECURITY
2016-01-26 23:17:35 +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 6562d34571 Merge "Revert "logd: security buffer only AID_SYSTEM reader"" am: c85ce9ba8e
am: 55045303f7

* commit '55045303f732f744554f15fce5e09327e3c348a0':
  Revert "logd: security buffer only AID_SYSTEM reader"
2016-01-26 23:04: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
James Hawkins 198f007e21 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
am: e4d688e27c

* commit 'e4d688e27c0135bfbbc4d6542813cad5c7337df2':
  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:56:55 +00:00
Mark Salyzyn 046d676a1e Merge "logd: security buffer only AID_SYSTEM reader" am: 69ce7c5483
am: c3dff7a5dc

* commit 'c3dff7a5dc80cd296df001c7ead8a869ca30e640':
  logd: security buffer only AID_SYSTEM reader
2016-01-26 21:56:48 +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