Tom Cherry
bcac4a98d4
Merge "Update init documentation to reflect fs_config changes" am: b11afd7741
...
am: 80625ed1c3
* commit '80625ed1c3674ab8abf56a7bacd5151215215020':
Update init documentation to reflect fs_config changes
2015-12-11 14:19:10 -08:00
Josh Gao
c56e68f0eb
Merge "adb: make pulling symlinks and devices work." am: c8e793685c
...
am: 8b99185552
* commit '8b99185552fd49e7902404352e0b5fda266263fd':
adb: make pulling symlinks and devices work.
2015-12-11 14:18:54 -08:00
Tom Cherry
80625ed1c3
Merge "Update init documentation to reflect fs_config changes"
...
am: b11afd7741
* commit 'b11afd7741c5e939bf5c6fb47dcadc49e3664f32':
Update init documentation to reflect fs_config changes
2015-12-11 14:11:07 -08:00
Tom Cherry
b11afd7741
Merge "Update init documentation to reflect fs_config changes"
2015-12-11 21:23:12 +00:00
Tom Cherry
dbddb40c95
Update init documentation to reflect fs_config changes
...
Change-Id: I00296d90c44af369a51ecb5cbb667567328f0053
2015-12-11 13:20:38 -08:00
Josh Gao
8b99185552
Merge "adb: make pulling symlinks and devices work."
...
am: c8e793685c
* commit 'c8e793685c816531cd2f2af7229b3f6b41d14a7c':
adb: make pulling symlinks and devices work.
2015-12-11 13:17:53 -08:00
Josh Gao
c8e793685c
Merge "adb: make pulling symlinks and devices work."
2015-12-11 21:04:25 +00:00
Josh Gao
f264224191
adb: make pulling symlinks and devices work.
...
Bug: http://b/25972989
Bug: http://b/26085751
Change-Id: I43842871522ea5f67a8c258dcb6ddafa8dd744c8
2015-12-11 12:51:38 -08:00
Andy Hung
c7ae5210a7
Merge "Add audioserver uid and restart service when needed"
2015-12-11 20:08:51 +00:00
Mark Salyzyn
829be0202a
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY" am: 86052a5d4f
...
am: 72398c0515
* commit '72398c051567d735df677a7527533f2f1dc5a882':
logd: liblog: logcat: Add LOG_ID_SECURITY
2015-12-11 10:58:32 -08:00
Mike Frysinger
7e4d906f2f
Merge "adbd: refactor priv dropping logic" am: 6945e36060
...
am: e2d0403e1c
* commit 'e2d0403e1c6fc610e1536090e903ddced58a2015':
adbd: refactor priv dropping logic
2015-12-11 10:58:00 -08:00
Mark Salyzyn
d4ac73bd6a
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ... am: 30edbdce9b
...
am: 5afb3f5f67
* commit '5afb3f5f678627d42ceae617069ff38d9773a005':
logger.h: reduce maximum payload so sum is page size
liblog: test for maximum payload can not survive change
liblog: logprint use uid name if length less then 5
liblog: logprint add uid format modifier
liblog: readlog apps get logger_entry_v4 for pstore
logd: readlog apps get logger_entry_v4
logger.h: Add definition for logger_entry_v4
2015-12-11 10:57:51 -08:00
Mark Salyzyn
72398c0515
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY"
...
am: 86052a5d4f
* commit '86052a5d4f217a73c769c77f7ac0904b65e67942':
logd: liblog: logcat: Add LOG_ID_SECURITY
2015-12-11 09:41:29 -08:00
Mark Salyzyn
86052a5d4f
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY"
2015-12-11 17:33:33 +00:00
Mike Frysinger
e2d0403e1c
Merge "adbd: refactor priv dropping logic"
...
am: 6945e36060
* commit '6945e360601a37301a6a678389d7bc9e974b1e23':
adbd: refactor priv dropping logic
2015-12-11 09:11:56 -08:00
Mike Frysinger
6945e36060
Merge "adbd: refactor priv dropping logic"
2015-12-11 17:03:19 +00:00
Mark Salyzyn
5afb3f5f67
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ...
...
am: 30edbdce9b
* commit '30edbdce9bb5e76e02f5bdb1ee33cea2b62c7ceb':
logger.h: reduce maximum payload so sum is page size
liblog: test for maximum payload can not survive change
liblog: logprint use uid name if length less then 5
liblog: logprint add uid format modifier
liblog: readlog apps get logger_entry_v4 for pstore
logd: readlog apps get logger_entry_v4
logger.h: Add definition for logger_entry_v4
2015-12-11 08:59:38 -08:00
Mark Salyzyn
30edbdce9b
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ...
...
* changes:
logger.h: reduce maximum payload so sum is page size
liblog: test for maximum payload can not survive change
liblog: logprint use uid name if length less then 5
liblog: logprint add uid format modifier
liblog: readlog apps get logger_entry_v4 for pstore
logd: readlog apps get logger_entry_v4
logger.h: Add definition for logger_entry_v4
2015-12-11 16:42:28 +00:00
Daichi Hirono
db85484423
Merge "Add /mnt/appfuse mount point to init.rc."
2015-12-11 06:16:29 +00:00
Daichi Hirono
7abc71ecd3
Add /mnt/appfuse mount point to init.rc.
...
BUG=25755834
Change-Id: I00b1185aec7a95baa6ef2f345a49761f3d006c4d
2015-12-11 13:29:04 +09:00
Mark Salyzyn
5e664d1f77
Merge "logd: best 2/3 filter for timezone glitches" am: ad9dac1c27
...
am: 64f6251f60
* commit '64f6251f60475efa64a536eedfde44fe4f3ae35d':
logd: best 2/3 filter for timezone glitches
2015-12-10 15:49:15 -08:00
Mark Salyzyn
64f6251f60
Merge "logd: best 2/3 filter for timezone glitches"
...
am: ad9dac1c27
* commit 'ad9dac1c2795ed28f3a011182f176d852ee269ee':
logd: best 2/3 filter for timezone glitches
2015-12-10 15:45:09 -08:00
Todd Poynor
7223e71bcd
Merge "crash_reporter: use libmetricscollectorservice for user crash event reports" am: f2b8cb9023
...
am: 6fa162fdf3
* commit '6fa162fdf3d8810e9ffd7642011e183a1cf55952':
crash_reporter: use libmetricscollectorservice for user crash event reports
2015-12-10 15:43:45 -08:00
Todd Poynor
d975a0ffd2
Merge "metrics_collector: add libmetricscollectorservice binder service" am: 5fc82ef714
...
am: 8e9877412b
* commit '8e9877412b2dcfc1824b7c2d635f6b32e8279cd7':
metrics_collector: add libmetricscollectorservice binder service
2015-12-10 15:43:38 -08:00
Josh Gao
eaad29ed53
Merge "adb: shell: add -n flag to not read from stdin." am: aae38d9704
...
am: 5abed250dd
* commit '5abed250dd8a808271527c02a8c7758a863541fc':
adb: shell: add -n flag to not read from stdin.
2015-12-10 15:43:31 -08:00
Mark Salyzyn
dccc24a2e1
Merge "logd: logd-reinit exits with 194" am: c172d9e204
...
am: 7aa44977b5
* commit '7aa44977b5dbed8bc1eb1376159cbe11524466b9':
logd: logd-reinit exits with 194
2015-12-10 15:43:24 -08:00
Nick Kralevich
d1de91b26c
Merge "Revert "adb: Make HOME=/data/local/tmp"" am: ce4bbcfb08
...
am: a09565ad1d
* commit 'a09565ad1d4c552b6d1dc8be28cf674d2ec8b3ec':
Revert "adb: Make HOME=/data/local/tmp"
2015-12-10 15:43:17 -08:00
Sami Tolvanen
dce48bc06e
Merge "fs_mgr: support upstream dm-verity without error correction" am: 907ec7daa7
...
am: 2d4ec2e663
* commit '2d4ec2e6634ae3d55836167ba9ae02fb5703fe33':
fs_mgr: support upstream dm-verity without error correction
2015-12-10 15:43:10 -08:00
Sami Tolvanen
6401e61a6a
Merge "Set up dm-verity in EIO mode instead of logging mode" am: 0d1214c68e
...
am: 42a86f8d1e
* commit '42a86f8d1e918356e86d4eb3fb2444a8c42d25ff':
Set up dm-verity in EIO mode instead of logging mode
2015-12-10 15:43:02 -08:00
Todd Poynor
40e795d55d
Merge "metricsd binder: Abort if fail to register service" am: 59e5c25919
...
am: 4a90546b6f
* commit '4a90546b6f1d2e256993389e5ff9e0bec6da68c2':
metricsd binder: Abort if fail to register service
2015-12-10 15:42:55 -08:00
Josh Gao
0f871e8257
Merge "adb: make the test_pull_dir test actually test something." am: f31aba9e8d
...
am: e0dcc75107
* commit 'e0dcc751072591e471a489e18d2d30abc045ffa4':
adb: make the test_pull_dir test actually test something.
2015-12-10 15:42:48 -08:00
Josh Gao
12debfc4cb
Merge "Move adb tests to system/core/adb." am: 4d0e10b24e
...
am: fe5c23b388
* commit 'fe5c23b388d1c4166558f4b3d3222f9015528afb':
Move adb tests to system/core/adb.
2015-12-10 15:42:30 -08:00
Mark Salyzyn
ad9dac1c27
Merge "logd: best 2/3 filter for timezone glitches"
2015-12-10 23:38:03 +00:00
Todd Poynor
6fa162fdf3
Merge "crash_reporter: use libmetricscollectorservice for user crash event reports"
...
am: f2b8cb9023
* commit 'f2b8cb9023c3f41f3655e8b34a5bee40ee70b948':
crash_reporter: use libmetricscollectorservice for user crash event reports
2015-12-10 14:35:55 -08:00
Todd Poynor
8e9877412b
Merge "metrics_collector: add libmetricscollectorservice binder service"
...
am: 5fc82ef714
* commit '5fc82ef714a462fdceda791035fc1a9847e83458':
metrics_collector: add libmetricscollectorservice binder service
2015-12-10 14:35:48 -08:00
Todd Poynor
f2b8cb9023
Merge "crash_reporter: use libmetricscollectorservice for user crash event reports"
2015-12-10 22:25:33 +00:00
Todd Poynor
5fc82ef714
Merge "metrics_collector: add libmetricscollectorservice binder service"
2015-12-10 22:25:19 +00:00
Josh Gao
5abed250dd
Merge "adb: shell: add -n flag to not read from stdin."
...
am: aae38d9704
* commit 'aae38d9704a6c5a2a7dfd9b628bd89822f1cbb60':
adb: shell: add -n flag to not read from stdin.
2015-12-10 13:40:56 -08:00
Todd Poynor
8361935de8
crash_reporter: use libmetricscollectorservice for user crash event reports
...
Drop dependencies on D-Bus.
Bug: 25929888
Change-Id: Ie21c2feee098887ebb2dac14c866e28689e9343e
2015-12-10 13:34:10 -08:00
Todd Poynor
694553d097
metrics_collector: add libmetricscollectorservice binder service
...
Switch user crash event notification from D-Bus to this Binder service.
Add a trampoline as a go-between for the -frtti and -fno-rtti sources.
Add MetricsCollectorServiceClient for crash_reporter to use, hiding the
binder proxy details.
Remove D-Bus message filtering from metrics_collector.
Bug: 25929888
Change-Id: Idcdd60ac476340fb11602fc9afab6cd87843e529
2015-12-10 13:34:10 -08:00
Mark Salyzyn
7aa44977b5
Merge "logd: logd-reinit exits with 194"
...
am: c172d9e204
* commit 'c172d9e204cc8ccb1632158059e93d06efe5563b':
logd: logd-reinit exits with 194
2015-12-10 13:33:28 -08:00
Josh Gao
aae38d9704
Merge "adb: shell: add -n flag to not read from stdin."
2015-12-10 21:30:19 +00:00
Mark Salyzyn
c172d9e204
Merge "logd: logd-reinit exits with 194"
2015-12-10 21:24:45 +00:00
Mark Salyzyn
b06247d9a0
logd: best 2/3 filter for timezone glitches
...
klogd is sensitive to changes in timezone resulting in glitches
surrounding conversion to local realtime logging. logger manages
a map from monotonic to realtime, but the process is racey since
the system can change the timezone at any time, this catches those
cases where it glitches.
Bug: 21868540
Change-Id: I03de6675fcd04f18ba7306a24dc3d9e750d86976
2015-12-10 13:20:48 -08:00
Nick Kralevich
a09565ad1d
Merge "Revert "adb: Make HOME=/data/local/tmp""
...
am: ce4bbcfb08
* commit 'ce4bbcfb08bea39dce8c4f71da7326814edfb247':
Revert "adb: Make HOME=/data/local/tmp"
2015-12-10 12:57:48 -08:00
Josh Gao
7d58607360
adb: shell: add -n flag to not read from stdin.
...
Shell scripts of the following form do not work properly with adb:
echo "foo\nbar\nbaz" | {
read FOO
while [ "$FOO" != "" ]; do
adb shell echo $FOO
read FOO
done
}
The first run of adb shell will consume all of the contents of stdin,
causing the loop to immediately end. ssh solves this by providing a -n
flag that causes it to not read from stdin. This commit adds the same.
Bug: http://b/25817224
Change-Id: Id74ca62ef520bcf03678b50f4bf203916fd81038
2015-12-10 12:52:06 -08:00
Nick Kralevich
ce4bbcfb08
Merge "Revert "adb: Make HOME=/data/local/tmp""
2015-12-10 20:48:08 +00:00
Nick Kralevich
b118762241
Revert "adb: Make HOME=/data/local/tmp"
...
During early boot, we may be mounting and unmounting /data.
Having the home directory for adb shell commands, such as
"adb shell logcat", on the /data directory prevents unmounting.
This reverts commit 173eb396c7 .
Bug: 26132185
Change-Id: Ib7c2f9e696f52bf5bbb79223d90dd76791779587
2015-12-10 20:42:18 +00:00
Mark Salyzyn
f011a335f2
logd: logd-reinit exits with 194
...
Bug: 26115803
Change-Id: I6e8843ce9766756a40e6d176e0a822f62045c2af
2015-12-10 12:26:08 -08:00
Sami Tolvanen
2d4ec2e663
Merge "fs_mgr: support upstream dm-verity without error correction"
...
am: 907ec7daa7
* commit '907ec7daa761624012476e540d8fe473b67b94bf':
fs_mgr: support upstream dm-verity without error correction
2015-12-10 12:20:13 -08:00