Commit graph

31391 commits

Author SHA1 Message Date
Bo Hu
08ef70558d Merge changes from topic 'qemu-cp'
* changes:
  Qemu: make the qemu_pipe_open back compatible
  Emulator: Enhance qemu_pipe.h to handle partial rw
  Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe
2017-03-28 18:13:54 +00:00
Mark Salyzyn
add1b0f140 Merge "libcutils: handle root directory empty path" am: 6105dbd01b am: 621ae033a4 am: a31d895910
am: 7de072bcb5

Change-Id: Ibe3deb545ab78a3740b9f6cfce961872a8189c2f
2017-03-28 17:44:41 +00:00
Mark Salyzyn
7de072bcb5 Merge "libcutils: handle root directory empty path" am: 6105dbd01b am: 621ae033a4
am: a31d895910

Change-Id: Icd4d70fecb09e26b9de45621e910f2d9dbec8d07
2017-03-28 17:27:30 +00:00
Mark Salyzyn
a31d895910 Merge "libcutils: handle root directory empty path" am: 6105dbd01b
am: 621ae033a4

Change-Id: Ibde5e2b3d703b1dbd42d01f9e5720d6075a2dd45
2017-03-28 17:23:24 +00:00
Mark Salyzyn
621ae033a4 Merge "libcutils: handle root directory empty path"
am: 6105dbd01b

Change-Id: I48f4607f72c56ffb8bbf63682a70954995d48a28
2017-03-28 17:19:16 +00:00
Mark Salyzyn
6105dbd01b Merge "libcutils: handle root directory empty path" 2017-03-28 17:09:15 +00:00
bohu
a19abf1769 Qemu: make the qemu_pipe_open back compatible
Commit c7b098ceb5 has changed
the qemu_pipe_open interface to require the "pipe:" prefix in
the service name.

However in APIs 24 and before, the "pipe:" prefix is not required
This causes quite some confusion and bugs since it is very common
to forget the difference when working across differnet APIs.

This CL is meant to make qemu_pipe_open work in both cases by
doing the following:
1. try the service name as is;
2. if it fails, add 'pipe:' prefix and try the service name again.

Change-Id: If9782396c03780fad1aadeb8374eb308517dc963
(cherry picked from aosp f7d64fd8e1)
2017-03-28 09:27:43 -07:00
bohu
7b60bd95df Emulator: Enhance qemu_pipe.h to handle partial rw
Partial read and write happen and it is better to try again
unless there is some hard error. This is meant to fix some
flaky behavior of emulator pipe services, hopefully.

BUG: 35207286

manually tested this on emulator image.

(cherry picked from aosp f099dce4a6)

Change-Id: I26a4560fa34e979939edcc882fcc5190202fe9f6
2017-03-28 09:27:28 -07:00
bohu
ff87855e10 Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe
Traditionally, qemu_pipe has both the declaration and implentation of each
function in one header file--qemu_pipe.h, and it is getting incovenient to
maintain.

This CL separates the implementation of functions from the header file,
and makes qemu_pipe a static library for other modules to link to.

Note that the interface and implementation of qemu_pipe are kept unchanged,
and future CLs will enhance the implementation to make it more reliable and
more compatible with old and new API levels.

Following projects are affected by this refactoring, and they are modified
accordingly:

hardware/ril/reference-ril

Change-Id: I541ecbf0cc7eadeef9d4e37ffd9ca7bfcc5c94c0
(cherry picked from aosp 294d44be33)
2017-03-28 09:27:00 -07:00
Bowgo Tsai
a5b0cdcc5b Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()" am: c8c3e61eeb am: c30261f266 am: 73d9e8e938
am: 207a9fcec9

Change-Id: I55f4a04a2ed9d52ee07b9bce96cd9c8dc5e445b3
2017-03-28 16:04:38 +00:00
Bowgo Tsai
207a9fcec9 Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()" am: c8c3e61eeb am: c30261f266
am: 73d9e8e938

Change-Id: I3b0caeda0d9b9ecf2aeb1592463c55e8480adf69
2017-03-28 15:59:49 +00:00
Bowgo Tsai
73d9e8e938 Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()" am: c8c3e61eeb
am: c30261f266

Change-Id: I31d1a7adf5aa86dc50a1b971d075a83f5d1e655a
2017-03-28 15:53:47 +00:00
Bowgo Tsai
c30261f266 Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()"
am: c8c3e61eeb

Change-Id: Ia5e4c77d45652c8b6d4e147175db99e44fecc0d5
2017-03-28 15:49:18 +00:00
Treehugger Robot
c8c3e61eeb Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()" 2017-03-28 15:43:56 +00:00
Mark Salyzyn
f2db147045 Merge "logd: strip out empty trailing iovec" am: 6b11faeb42 am: d749a054ff am: 657ae57bf3
am: 046855b551

Change-Id: I20d92336df9edb9082a0bfb4dc59d3423fea9ed9
2017-03-28 15:22:16 +00:00
Mark Salyzyn
046855b551 Merge "logd: strip out empty trailing iovec" am: 6b11faeb42 am: d749a054ff
am: 657ae57bf3

Change-Id: I522284e11471e9eb4db091275d5461860e8c2e4b
2017-03-28 15:18:43 +00:00
Mark Salyzyn
657ae57bf3 Merge "logd: strip out empty trailing iovec" am: 6b11faeb42
am: d749a054ff

Change-Id: If8441997a5cefc4af09d3930a23ae69412ce11fa
2017-03-28 15:12:44 +00:00
Mark Salyzyn
d749a054ff Merge "logd: strip out empty trailing iovec"
am: 6b11faeb42

Change-Id: Ib6244cf3cd089c44dd71524e09f6d4a2227c65bd
2017-03-28 15:08:15 +00:00
Mark Salyzyn
6b11faeb42 Merge "logd: strip out empty trailing iovec" 2017-03-28 15:00:38 +00:00
Jeremy Compostella
3d642d48e2 libcutils: handle root directory empty path
Usually, the canned paths lack the leading '/' which means that the
root directory is an empty path.  This patch makes
load_canned_fs_config() handle this empty path as the root directory.
It also make it flexible enough to handle an optional leading '/'.

Original-Author: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
Change-Id: Ice759ef37d1df23a54df1158ec0d3ad7f577a069
2017-03-28 14:57:22 +00:00
Bowgo Tsai
0f34094a17 fs_mgr: change the log level in fs_mgr_get_boot_config()
fs_mgr might try to get a non-existing config through fs_mgr_get_boot_config()
on a device (e.g., for backward compatibility). Lower the log level to INFO
so it won't appear on the recovery screen.

Bug: 35811655
Test: recovery boot sailfish
Change-Id: I81497259aff3691740170abeef932d363b52be35
2017-03-28 18:52:04 +08:00
TreeHugger Robot
db21699b8c Merge "Change FuseAppLoop so that it can process messages asynchronously." 2017-03-28 09:41:54 +00:00
Steven Moreland
94f3ca8776 Merge "init: add class_restart" am: 8678872a00 am: ee7137208e
am: 0bd29405c0

Change-Id: I068cfa11752439d68b6f62a7cbc473250c7ab068
2017-03-28 04:36:41 +00:00
Steven Moreland
0bd29405c0 Merge "init: add class_restart" am: 8678872a00
am: ee7137208e

Change-Id: I374ccbdf12eb2dc797ce3d6cc815983730ca5fcd
2017-03-28 04:32:10 +00:00
Steven Moreland
ee7137208e Merge "init: add class_restart"
am: 8678872a00

Change-Id: I92e6669b0e0a9b87fffc400f8a1ee2699bdda7fc
2017-03-28 04:27:40 +00:00
Treehugger Robot
8678872a00 Merge "init: add class_restart" 2017-03-28 04:22:47 +00:00
Josh Gao
b1bb1acd70 Merge "debuggerd_client: properly wait for completion." am: 372d8a2931 am: 6340d91308
am: 47df3d4c66

Change-Id: I036304dbf6eaf3fee45986eca1df70990dcca9eb
2017-03-28 03:33:36 +00:00
Josh Gao
47df3d4c66 Merge "debuggerd_client: properly wait for completion." am: 372d8a2931
am: 6340d91308

Change-Id: I90058d0d8bb89a839b262456e1b91ef15abfa71f
2017-03-28 03:29:36 +00:00
Josh Gao
6340d91308 Merge "debuggerd_client: properly wait for completion."
am: 372d8a2931

Change-Id: I16cc3b9538e9b9b0ca3662b0a2f64b55aa38100a
2017-03-28 03:24:35 +00:00
Treehugger Robot
372d8a2931 Merge "debuggerd_client: properly wait for completion." 2017-03-28 03:21:39 +00:00
Tom Cherry
8557b0e5a2 Merge "init: remove superfluous forward definitions" am: deb23ba2c1 am: 256c8f5076
am: 856441d07f

Change-Id: I6f3a642497d549a766146dfbb9b0cf72497ed85f
2017-03-28 02:40:04 +00:00
Tom Cherry
856441d07f Merge "init: remove superfluous forward definitions" am: deb23ba2c1
am: 256c8f5076

Change-Id: If844bf1c8c38465365bdc9d8b0f4c78c045c7b8f
2017-03-28 02:35:59 +00:00
Tom Cherry
256c8f5076 Merge "init: remove superfluous forward definitions"
am: deb23ba2c1

Change-Id: Ic8126b783cf8083a64cc0955074f586420685cdd
2017-03-28 02:32:10 +00:00
Treehugger Robot
deb23ba2c1 Merge "init: remove superfluous forward definitions" 2017-03-28 02:22:51 +00:00
Tom Cherry
307e12d429 Merge "init: Fix README.md for writepid" am: 88d6b4af16 am: dc597affcc
am: b64b91ccaa

Change-Id: I5230ce4b416de3afa2caaebb23506aaa6b0cbd8f
2017-03-28 01:22:22 +00:00
Tom Cherry
b64b91ccaa Merge "init: Fix README.md for writepid" am: 88d6b4af16
am: dc597affcc

Change-Id: I75ea8f8f2b3ddff6af353498337153d21a86d91a
2017-03-28 01:17:57 +00:00
Tom Cherry
dc597affcc Merge "init: Fix README.md for writepid"
am: 88d6b4af16

Change-Id: Ic65adea2c9fc69118890f0be79f45152be307bcf
2017-03-28 01:13:57 +00:00
Treehugger Robot
88d6b4af16 Merge "init: Fix README.md for writepid" 2017-03-28 01:07:50 +00:00
Tom Cherry
46b6c43b7c init: remove superfluous forward definitions
Test: Boot bullhead
Change-Id: I4a005616a825529bc2ad1b413e51b501f6407cbd
2017-03-27 17:55:37 -07:00
Wei Wang
d436414b7f Merge "init: add support of multiple class names" am: 3c1568aa13 am: fd450bb95a
am: 4640918495

Change-Id: I0c0d72650196bdbf5288c07c114f57d3e43c9a87
2017-03-28 00:55:25 +00:00
Wei Wang
4640918495 Merge "init: add support of multiple class names" am: 3c1568aa13
am: fd450bb95a

Change-Id: Ia859d1817eb80a34f339fe99894bffa4163440ce
2017-03-28 00:51:25 +00:00
Wei Wang
fd450bb95a Merge "init: add support of multiple class names"
am: 3c1568aa13

Change-Id: Ib018fc301449ab8f2d1db8550724c11d5df0430e
2017-03-28 00:47:55 +00:00
Bowgo Tsai
9b83226871 Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" am: ea057b46e0 am: 75ada5fce3
am: f6b7adb464

Change-Id: I375d5a1129253d9c08e6b57039487f094bf3dd42
2017-03-28 00:43:24 +00:00
Bowgo Tsai
f6b7adb464 Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" am: ea057b46e0
am: 75ada5fce3

Change-Id: I7e0e955d11a7f956f70bc04a95a2fe31fb2d5a4b
2017-03-28 00:39:24 +00:00
Treehugger Robot
3c1568aa13 Merge "init: add support of multiple class names" 2017-03-28 00:39:09 +00:00
Bowgo Tsai
75ada5fce3 Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition"
am: ea057b46e0

Change-Id: Ib7583cd28f93e882a00dade3507ee75183674115
2017-03-28 00:35:57 +00:00
Treehugger Robot
ea057b46e0 Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" 2017-03-28 00:28:33 +00:00
Wei Wang
d04ab5abfb Merge "libcutils: remove schedgroup" am: 3d8911fbbe am: c0fc8e7b7b
am: eb6d588cd6

Change-Id: I0a088c378ade4c3eccc338eb4d7a5b5894b5bfbc
2017-03-28 00:28:25 +00:00
Wei Wang
eb6d588cd6 Merge "libcutils: remove schedgroup" am: 3d8911fbbe
am: c0fc8e7b7b

Change-Id: I348e7151248f3116f483f6c5ae4e7c924fe75490
2017-03-28 00:24:53 +00:00
Wei Wang
c0fc8e7b7b Merge "libcutils: remove schedgroup"
am: 3d8911fbbe

Change-Id: I351d6c199512cc8e5c5cd466452ea910f69061e7
2017-03-28 00:21:53 +00:00