Steven Moreland
ba2e677615
Merge "fs_config: wifi is now on vendor partition" am: 11d3d4d22a am: c405ad5c43 am: 0d94c26fc9
...
am: 141b829e72
Change-Id: Ibd47a0775ca2c27579f4ff98ae2e8c5a55fcb5e8
2017-02-14 03:14:18 +00:00
Steven Moreland
141b829e72
Merge "fs_config: wifi is now on vendor partition" am: 11d3d4d22a am: c405ad5c43
...
am: 0d94c26fc9
Change-Id: I0a4885c45fa9ddcc88c7cab6439ba5ba2fcfb4b3
2017-02-14 03:12:18 +00:00
Josh Gao
f73e77953c
Merge "debuggerd_handler: don't use waitpid(..., __WCLONE)." am: c2467e03ce am: 6579e50ee5 am: 78cb6864c8
...
am: 286da17554
Change-Id: I15057e1c856c1948b46d6dac8605e28e75269102
2017-02-14 03:09:18 +00:00
Steven Moreland
0d94c26fc9
Merge "fs_config: wifi is now on vendor partition" am: 11d3d4d22a
...
am: c405ad5c43
Change-Id: I5c4f1b9ea57bea13b97016da98830c87a767ec53
2017-02-14 03:09:17 +00:00
Josh Gao
286da17554
Merge "debuggerd_handler: don't use waitpid(..., __WCLONE)." am: c2467e03ce am: 6579e50ee5
...
am: 78cb6864c8
Change-Id: I0fe42c7bb42a9da233980943c8b5b8476abcbff3
2017-02-14 03:07:48 +00:00
Steven Moreland
c405ad5c43
Merge "fs_config: wifi is now on vendor partition"
...
am: 11d3d4d22a
Change-Id: Iaaff4b41d7ac72f68717d5ee5f6bf15861439d0a
2017-02-14 03:07:48 +00:00
Josh Gao
78cb6864c8
Merge "debuggerd_handler: don't use waitpid(..., __WCLONE)." am: c2467e03ce
...
am: 6579e50ee5
Change-Id: I876df61ab58fda3218020b0845431b66fa86d9d3
2017-02-14 03:05:47 +00:00
Treehugger Robot
11d3d4d22a
Merge "fs_config: wifi is now on vendor partition"
2017-02-14 03:05:03 +00:00
Josh Gao
6579e50ee5
Merge "debuggerd_handler: don't use waitpid(..., __WCLONE)."
...
am: c2467e03ce
Change-Id: I8a59760ea238b6c9eca29f0ffa7369ae51a7284b
2017-02-14 03:03:47 +00:00
Josh Gao
c2467e03ce
Merge "debuggerd_handler: don't use waitpid(..., __WCLONE)."
2017-02-14 03:00:37 +00:00
James Hawkins
4021dc794f
Merge "libmetricslogger: Use libBionicGtestMain instead of a custom test runner." am: 07e57b4b25 am: 1715ee2854 am: 3bec397e50
...
am: 64b4d074ba
Change-Id: I7f683bc13611be12c763fb76d511d45133de60f7
2017-02-14 02:19:05 +00:00
James Hawkins
64b4d074ba
Merge "libmetricslogger: Use libBionicGtestMain instead of a custom test runner." am: 07e57b4b25 am: 1715ee2854
...
am: 3bec397e50
Change-Id: I4d172ce894f64531734e6c87a64c543edc5bbe7a
2017-02-14 02:17:03 +00:00
James Hawkins
3bec397e50
Merge "libmetricslogger: Use libBionicGtestMain instead of a custom test runner." am: 07e57b4b25
...
am: 1715ee2854
Change-Id: I9121b0b04270580d66c516dae139c23c107c2e45
2017-02-14 02:14:34 +00:00
James Hawkins
1715ee2854
Merge "libmetricslogger: Use libBionicGtestMain instead of a custom test runner."
...
am: 07e57b4b25
Change-Id: I381e97ba2555df545fb63e7fe062da6783ef8687
2017-02-14 02:12:31 +00:00
Treehugger Robot
07e57b4b25
Merge "libmetricslogger: Use libBionicGtestMain instead of a custom test runner."
2017-02-14 02:07:30 +00:00
Steven Moreland
b7ca92349e
fs_config: wifi is now on vendor partition
...
Bug: 34135607
Test: pass
Change-Id: I0c9dd9642e780a0303e6aaa6d80e443c59cc0c28
2017-02-13 17:21:17 -08:00
Josh Gao
c3c8c029ec
debuggerd_handler: don't use waitpid(..., __WCLONE).
...
waitpid(..., __WCLONE) fails with ECHILD when passed an explicit PID to
wait for. __WALL and __WCLONE don't seem to be necessary when waiting
for a specific pid, so just pass 0 in the flags instead.
Bug: http://b/35327712
Test: /data/nativetest/debuggerd_test/debuggerd_test32 --gtest_filter="*zombie*"
Change-Id: I3dd7a1bdf7ff35fdfbf631429c089ef4e3172855
2017-02-13 17:01:24 -08:00
Yabin Cui
07b2c2b730
Merge "libbase: fix the way to find temp dir." am: b13d4a31a3 am: 8a5f594bc3 am: 03c1392aa3
...
am: e3f6a45f80
Change-Id: Ia97c37f9a7f67f2130538644ef40b6e89e901ec0
2017-02-14 00:44:01 +00:00
Yabin Cui
e3f6a45f80
Merge "libbase: fix the way to find temp dir." am: b13d4a31a3 am: 8a5f594bc3
...
am: 03c1392aa3
Change-Id: I24fe4e6b8aaf8a26905704aecc4e7597cc4e1678
2017-02-14 00:41:25 +00:00
Yabin Cui
03c1392aa3
Merge "libbase: fix the way to find temp dir." am: b13d4a31a3
...
am: 8a5f594bc3
Change-Id: I4a3c1afd78b567c4c379cfb25a6b8ae58c06b810
2017-02-14 00:38:13 +00:00
Yabin Cui
8a5f594bc3
Merge "libbase: fix the way to find temp dir."
...
am: b13d4a31a3
Change-Id: I8e3690c1e4b9cb4ce67e1bba323b21c3f9f7bcd9
2017-02-14 00:35:44 +00:00
Yabin Cui
b13d4a31a3
Merge "libbase: fix the way to find temp dir."
2017-02-14 00:29:40 +00:00
Yabin Cui
57e9cea099
libbase: fix the way to find temp dir.
...
Tests running in app context can't access /data/local/tmp,
so try current directory if /data/local/tmp is not accessible.
Bug: http://b/18790309
Test: run unit test in app context and shell context.
Change-Id: If66fe8f0ac3edb3a32a2a2a50a524364f818a58b
2017-02-13 15:50:56 -08:00
James Hawkins
7607adfd53
libmetricslogger: Use libBionicGtestMain instead of a custom test runner.
...
Also remove commented out code I accidentally left in.
Bug: 34456830
Test: libmetricslogger_test
Change-Id: If76d3013ec7eaa71cef67c6db04d810745e3833e
2017-02-13 13:41:44 -08:00
Yabin Cui
9121f507f1
Merge "libbacktraceoffline: make it thread-safe." am: a3e4977325 am: 47ac9e420f am: b850b9d589
...
am: e769f0b564
Change-Id: I6ebfa49bd5ff944a229ddaa8b81919c446c27078
2017-02-13 21:41:37 +00:00
Yabin Cui
e769f0b564
Merge "libbacktraceoffline: make it thread-safe." am: a3e4977325 am: 47ac9e420f
...
am: b850b9d589
Change-Id: I2301830f6c095e26a60507f70d14cf2ef7aa9016
2017-02-13 21:39:12 +00:00
Yabin Cui
b850b9d589
Merge "libbacktraceoffline: make it thread-safe." am: a3e4977325
...
am: 47ac9e420f
Change-Id: I3bcd573d2247abab595fab26fbc19a30192da56f
2017-02-13 21:36:38 +00:00
Yabin Cui
47ac9e420f
Merge "libbacktraceoffline: make it thread-safe."
...
am: a3e4977325
Change-Id: I90fab011054ffd9e3aa934cac551f3e0f9144ed0
2017-02-13 21:34:18 +00:00
Treehugger Robot
a3e4977325
Merge "libbacktraceoffline: make it thread-safe."
2017-02-13 21:28:15 +00:00
TreeHugger Robot
631919b237
Merge changes I18592d29,Ic543e718,I9cd217df,I723c0850
...
* changes:
storaged: fix selinux dac_override denial
storaged: allow dump window to be less than an hour
storaged: add --force option to dumpsys
storaged: add dumpsys flags to limit data size
2017-02-13 20:10:12 +00:00
Dimitry Ivanov
ae00ceee5b
Merge "Add comment to android_link_namespaces method" am: 7e7913cb67 am: 70cfd3ae79 am: 02538b1f6b
...
am: 93c74fe6c0
Change-Id: I7b564fcf6f46843304351f2eec2b175bc2bffb25
2017-02-13 19:38:01 +00:00
Dimitry Ivanov
93c74fe6c0
Merge "Add comment to android_link_namespaces method" am: 7e7913cb67 am: 70cfd3ae79
...
am: 02538b1f6b
Change-Id: I34fa5985cc9efbd473ec5c136e0d77c03a13d8fc
2017-02-13 19:34:52 +00:00
Dimitry Ivanov
02538b1f6b
Merge "Add comment to android_link_namespaces method" am: 7e7913cb67
...
am: 70cfd3ae79
Change-Id: Ic2dc339da35e52af410cf8a056bad2f75733a258
2017-02-13 19:31:52 +00:00
Dimitry Ivanov
70cfd3ae79
Merge "Add comment to android_link_namespaces method"
...
am: 7e7913cb67
Change-Id: Iaa7062ebf722dc614552849579bcc80cb059d276
2017-02-13 19:28:52 +00:00
Treehugger Robot
7e7913cb67
Merge "Add comment to android_link_namespaces method"
2017-02-13 19:23:49 +00:00
James Hawkins
375799eda8
Merge "libmetricslogger: Refactor Tron metrics histogram logging out of bootstat." am: 64984aaa6e am: 348a393df4 am: e8466356d0
...
am: fd1c469be3
Change-Id: I2fc3390d84c59093ae514f606f8b3ffdf61d4797
2017-02-13 18:50:20 +00:00
Yabin Cui
e3fded38d9
Merge "libbacktraceoffline: choose correct debug section for a given address." am: 5c3a707542 am: c458193f7f am: f73fafcdaf
...
am: 96458ea334
Change-Id: I9ec111a69306a772d2e049a37bc1527f985b3512
2017-02-13 18:49:58 +00:00
James Hawkins
fd1c469be3
Merge "libmetricslogger: Refactor Tron metrics histogram logging out of bootstat." am: 64984aaa6e am: 348a393df4
...
am: e8466356d0
Change-Id: Ia65d9438bbef97da9a305d9381d7d0f18c607e7a
2017-02-13 18:47:35 +00:00
Yabin Cui
96458ea334
Merge "libbacktraceoffline: choose correct debug section for a given address." am: 5c3a707542 am: c458193f7f
...
am: f73fafcdaf
Change-Id: If633fd3c51314a6737203feab4a944b7c5d0efd4
2017-02-13 18:47:19 +00:00
James Hawkins
e8466356d0
Merge "libmetricslogger: Refactor Tron metrics histogram logging out of bootstat." am: 64984aaa6e
...
am: 348a393df4
Change-Id: I3a4ac2d3f10aa881477074cf9ce10a444c0e22fa
2017-02-13 18:45:00 +00:00
Yabin Cui
f73fafcdaf
Merge "libbacktraceoffline: choose correct debug section for a given address." am: 5c3a707542
...
am: c458193f7f
Change-Id: I0c705f6cbc04f90713cc834d68d85a672982bafd
2017-02-13 18:44:47 +00:00
James Hawkins
348a393df4
Merge "libmetricslogger: Refactor Tron metrics histogram logging out of bootstat."
...
am: 64984aaa6e
Change-Id: I6628c5ea371c34dcc1b0e8ff0a74758479dd7c58
2017-02-13 18:42:30 +00:00
Yabin Cui
c458193f7f
Merge "libbacktraceoffline: choose correct debug section for a given address."
...
am: 5c3a707542
Change-Id: If3188979346e26522707ac6aefa91a30a0300f13
2017-02-13 18:42:18 +00:00
James Hawkins
64984aaa6e
Merge "libmetricslogger: Refactor Tron metrics histogram logging out of bootstat."
2017-02-13 18:41:23 +00:00
Yabin Cui
26369a3a01
libbacktraceoffline: make it thread-safe.
...
Make libbacktraceoffline thread-safe by protecting the global variable with
a lock. So it can be used in a multi-thread environment, like by
simpleperf inplace sampling.
Bug: http://b/30974760
Test: no
Change-Id: I4699bf15dfa69ac75faeb4e79a73fb3af0f08dfc
2017-02-13 10:35:06 -08:00
Yabin Cui
5c3a707542
Merge "libbacktraceoffline: choose correct debug section for a given address."
2017-02-13 18:33:50 +00:00
Dimitry Ivanov
3f5b5dc546
Add comment to android_link_namespaces method
...
Test: n/a - comment only change
Bug: http://b/26833548
Change-Id: I40356eec37aeb864206982feb877c59c21c9a433
2017-02-13 08:52:35 -08:00
Paul Crowley
02897000b1
Merge "fs_mgr: allow specifying HEH filenames encryption"
2017-02-13 16:39:12 +00:00
Dimitry Ivanov
c48372305d
Merge "Replace public library list with shared lib sonames" am: fd87c062ab am: e6050e248a am: 14c0fead62
...
am: f159716c0c
Change-Id: Id2aacacd76929d23bb87054e6c5ddd646be25748
2017-02-11 19:42:36 +00:00
Dimitry Ivanov
f159716c0c
Merge "Replace public library list with shared lib sonames" am: fd87c062ab am: e6050e248a
...
am: 14c0fead62
Change-Id: Ibc0f2ae148232a7ec06fefb55f43ff65495b5004
2017-02-11 19:38:27 +00:00