Commit graph

28942 commits

Author SHA1 Message Date
Dimitry Ivanov
0c856b8a04 Merge "Add android::base::Realpath." am: b3fde950f2
am: 424bdf9ca1

Change-Id: Icccf533964855a9df160b0562ae41d1a896f828a
2017-03-16 06:59:37 +00:00
Dimitry Ivanov
424bdf9ca1 Merge "Add android::base::Realpath."
am: b3fde950f2

Change-Id: If241249cb24ce43aa91e91008090700b14f3064d
2017-03-16 06:57:07 +00:00
Treehugger Robot
b3fde950f2 Merge "Add android::base::Realpath." 2017-03-16 06:53:00 +00:00
Dimitry Ivanov
840b6019c0 Add android::base::Realpath.
Bug: http://b/31396973
Test: libbase_test on host and device
Change-Id: I1e5f15c76227ec1c2128baa38eb454d347987703
2017-03-15 22:20:50 -07:00
Dan Willemsen
5e30ce0ca0 Merge "Enable more modules on linux_bionic builds" am: 75c414d1a3
am: 5bb9220b75

Change-Id: I3dffb3e3ac95f8116321f165035a666645df34d0
2017-03-16 02:35:49 +00:00
Dan Willemsen
5bb9220b75 Merge "Enable more modules on linux_bionic builds"
am: 75c414d1a3

Change-Id: If8a08b3f080344e61ebf5a0555354edb95cfb92e
2017-03-16 02:33:19 +00:00
Treehugger Robot
75c414d1a3 Merge "Enable more modules on linux_bionic builds" 2017-03-16 02:27:54 +00:00
Dan Willemsen
e0cd1e043d Enable more modules on linux_bionic builds
Bug: 31559095
Test: Enable host bionic, run soong
Change-Id: Ib4ebd909322cf464b6a40040e4b60ece7d905b6f
2017-03-15 15:44:00 -07:00
Mark Salyzyn
e8b5dca8c2 Merge "logcat: test: tail_# occasional failures" am: e7b335b471
am: a1f43ebf89

Change-Id: I9da3e1580387ec4636a65540ffe415c3537ff1ff
2017-03-15 19:09:26 +00:00
Mark Salyzyn
a1f43ebf89 Merge "logcat: test: tail_# occasional failures"
am: e7b335b471

Change-Id: I4176e5e0ef3f0e2b8bc0edc9c49410f516f371f6
2017-03-15 19:04:19 +00:00
Treehugger Robot
e7b335b471 Merge "logcat: test: tail_# occasional failures" 2017-03-15 18:55:26 +00:00
Elliott Hughes
a251228645 Merge "Move "fastboot oem" to std::string." am: 54182110ae
am: 3547ba5e3f

Change-Id: I72c9ebde8b45df2e1fc9a3d303c0ab6547c6834b
2017-03-15 18:40:36 +00:00
Elliott Hughes
3547ba5e3f Merge "Move "fastboot oem" to std::string."
am: 54182110ae

Change-Id: I82a7eb3ab983989a3fbd9829abd28e866c816846
2017-03-15 18:36:04 +00:00
Treehugger Robot
54182110ae Merge "Move "fastboot oem" to std::string." 2017-03-15 18:28:12 +00:00
Elliott Hughes
4a66730d6a Move "fastboot oem" to std::string.
Not sure how this code got missed when we moved everything else off
C string handling...

  $ adb reboot bootloader
  $ fastboot oem `perl -e 'print "x"x1024;'`

Before:
  <crashes>

After:
  error: Command length (1028) exceeds maximum size (64)

(The error says 1028 instead of 1024 because it includes the "oem ".)

Bug: http://b/36232671
Test: fastboot oem `perl -e 'print "x"x1024;'`
Change-Id: Ib4664e49222bd2b71be5aa3fe81f386d6073414f
2017-03-15 09:40:28 -07:00
Andreas Gampe
a8fbb17d2d Merge "Logd: Fix wrong parameters" am: 913ad12543
am: 0daaa5aec8

Change-Id: I3bc438c69f6f3b10d86d42625b655636a7605ced
2017-03-15 15:46:57 +00:00
Andreas Gampe
0daaa5aec8 Merge "Logd: Fix wrong parameters"
am: 913ad12543

Change-Id: I4046e79b452c4be8dc75e774aa7bb9264c602b10
2017-03-15 15:41:56 +00:00
Treehugger Robot
913ad12543 Merge "Logd: Fix wrong parameters" 2017-03-15 15:38:14 +00:00
Evgenii Stepanov
99bd60a9eb Merge "Fix heap-buffer-overflow detected by ASAN." am: 3d028f14c8
am: 591b09650b

Change-Id: I2791a1110afb102dd796fb1aa91068620884c860
2017-03-15 06:57:58 +00:00
Evgenii Stepanov
591b09650b Merge "Fix heap-buffer-overflow detected by ASAN."
am: 3d028f14c8

Change-Id: Ia3c137490fae9da00f73dedd414ba2b8cd04a975
2017-03-15 06:52:56 +00:00
Treehugger Robot
3d028f14c8 Merge "Fix heap-buffer-overflow detected by ASAN." 2017-03-15 06:46:28 +00:00
Andreas Gampe
34450d70c5 Logd: Fix wrong parameters
Better keep the right order, or ASAN will complain when you read
out of bounds.

Bug: 36234128
Test: m
Test: m && m SANITIZE_TARGET=address
Test: Sanitized device boots without ASAN crashes
Change-Id: Ifc09cb0ece6835d2b636a3ad2128e09ca9aa45c9
2017-03-14 20:43:43 -07:00
Todd Poynor
91db71d2a0 Merge "libcutils: android_reboot: add thermal shutdown command" am: 97a2c49a58
am: 938f80838c

Change-Id: I11c1dc89f75a53623b7936eccf23ccb0859f2102
2017-03-15 02:24:01 +00:00
Todd Poynor
938f80838c Merge "libcutils: android_reboot: add thermal shutdown command"
am: 97a2c49a58

Change-Id: Id7d1731304324df4c6b770949b18aec5fc5f5aa4
2017-03-15 02:18:59 +00:00
Treehugger Robot
97a2c49a58 Merge "libcutils: android_reboot: add thermal shutdown command" 2017-03-15 02:11:40 +00:00
Tom Cherry
a6df649958 Merge "Remove extraneous .clang-format files" am: 41c7bb5055
am: ef3017bdbd

Change-Id: Idef0e5af5935cc5fe73540d4c1a3ff20af1ab428
2017-03-15 01:00:34 +00:00
Todd Poynor
37bba3b88a libcutils: android_reboot: add thermal shutdown command
Add ANDROID_RB_THERMOFF command to android_reboot(), denoting a power
off due to thermal limits exceeded.  When this command is used, Android
may provide notification to the user about the potentially unexpected
power off at next boot.

Bug: 30994946
Test: Manual: setprop sys.powerctl thermal-shutdown
Change-Id: If2cde1b6a3c281a5750b50295412a4801ed5b2f2
2017-03-14 17:58:25 -07:00
Tom Cherry
ef3017bdbd Merge "Remove extraneous .clang-format files"
am: 41c7bb5055

Change-Id: I5062d81a01cde71a9bbe7549f9e3c9198af955ae
2017-03-15 00:55:35 +00:00
Tom Cherry
41c7bb5055 Merge "Remove extraneous .clang-format files" 2017-03-15 00:46:44 +00:00
Mark Salyzyn
d70f246f8a logcat: test: tail_# occasional failures
When PID becomes 5 digits, fgetLongTime fails

Test: gTest logcat-unit-tests --gtest_filter=*.tail_*
Bug: 27319267
Change-Id: I9cc636ed9955a317eb3b0ff0a820a50b800b7e0d
2017-03-14 15:35:15 -07:00
Evgenii Stepanov
03fc2fedd7 Fix heap-buffer-overflow detected by ASAN.
Bug: 34949125
Bug: 34606909
Test: Make sure Android boots when built with SANITIZE_TARGET='address'
Change-Id: I9c004e806f2025098aa72228284b05affd2c2802
2017-03-14 14:47:25 -07:00
Tom Cherry
5b4eb23cfd Remove extraneous .clang-format files
The .clang-format files in the base, debuggerd, adb, libprocinfo, and
fastboot subdirectories each differ slightly from the top level
.clang-format-2 and .clang-format-4, but not in a substantially
meaningful way, as the source files in those directories have not been
re-formatted with clang-format.  Therefore, let's reduce the
differences and use only the two top level clang-format files.

Secondly perform some small clean-up of the top level .clang-format
files.  AllowShortBlocksOnASingleLine is already false in the Google
style, so it can be removed.  AllowShortFunctionsOnASingleLine should
not change between the -2 and -4 versions, so leave it at the Google
default style in both, which is 'All'.

The diff stats for these changes are:

./base/
Old:
640 insertions(+), 531 deletions(-)
New:
563 insertions(+), 808 deletions(-)

./debuggerd/
Old:
910 insertions(+), 886 deletions(-)
New:
991 insertions(+), 1023 deletions(-)

./adb/
Old:
2623 insertions(+), 2886 deletions(-)
New:
2655 insertions(+), 3103 deletions(-)

./libprocinfo/
Old:
2 insertions(+), 1 deletion(-)
New:
4 insertions(+), 18 deletions(-)

./fastboot/
Old:
618 insertions(+), 743 deletions(-)
New:
726 insertions(+), 882 deletions(-)

./init/
Old:
1755 insertions(+), 1866 deletions(-)
New:
1715 insertions(+), 1952 deletions(-)

Test: Above clang-format stats
Change-Id: I3f7b8ab0660c8394c5008ba95ea15e70dd22b55b
2017-03-14 14:06:31 -07:00
Tom Cherry
032f0a2655 Merge "init: fix DumpState() logging" am: f31abeb973
am: a968df9edb

Change-Id: If589ba5eea3f66cc450f5be13bf7054ae8e89d57
2017-03-14 20:20:27 +00:00
Christopher Ferris
68f84e9210 Merge "Use the clang format 2 space as default." am: 1252eba600
am: 880f129d36

Change-Id: Idb79004ca14a9023d9e54a6d944aa266f5f779a3
2017-03-14 20:20:14 +00:00
Tom Cherry
a968df9edb Merge "init: fix DumpState() logging"
am: f31abeb973

Change-Id: I6cacbecb42b594073659960c1d1bd9dea5281b82
2017-03-14 20:16:26 +00:00
Christopher Ferris
880f129d36 Merge "Use the clang format 2 space as default."
am: 1252eba600

Change-Id: Ia83d9a096b66b5cea9be84bdc2ed35fdb09c8983
2017-03-14 20:16:14 +00:00
Tom Cherry
f31abeb973 Merge "init: fix DumpState() logging" 2017-03-14 20:12:48 +00:00
Christopher Ferris
1252eba600 Merge "Use the clang format 2 space as default." 2017-03-14 20:11:32 +00:00
Christopher Ferris
87bf2082cf Use the clang format 2 space as default.
Test: NA
Change-Id: I97418804086b83cfba1765eb0bee3e7ca18fb4ea
2017-03-14 13:06:19 -07:00
Jeremy Compostella
244f447b65 Merge "ueventd: support by-name symlinks for virtual block devices" am: 0b4d34e31c
am: 4d003658ec

Change-Id: Id1b3af33eb30212c1569ec8eb6298cb2de477d01
2017-03-14 19:42:42 +00:00
Jeremy Compostella
4d003658ec Merge "ueventd: support by-name symlinks for virtual block devices"
am: 0b4d34e31c

Change-Id: If1d76eab6f535e0296247d7a4c8c56dcf73f24dd
2017-03-14 19:38:13 +00:00
Treehugger Robot
0b4d34e31c Merge "ueventd: support by-name symlinks for virtual block devices" 2017-03-14 19:29:35 +00:00
Tom Cherry
fdad550029 Merge "init: enable C++17" am: e3aef3dd99
am: e4275b52a8

Change-Id: I75ce732b58516e45084845da2c42a65c2b31aed1
2017-03-14 17:25:33 +00:00
Tom Cherry
e4275b52a8 Merge "init: enable C++17"
am: e3aef3dd99

Change-Id: I2b23cfad2c5a199c48dea513e200bea1f6257253
2017-03-14 17:21:32 +00:00
Tom Cherry
e3aef3dd99 Merge "init: enable C++17" 2017-03-14 17:17:40 +00:00
Christopher Ferris
183e8a8125 Merge "Add a binary to dump demangled names." am: 26afd16917
am: c05ae4824d

Change-Id: Ie5931006dd9cba215ab21234f383b5686ab2793e
2017-03-14 16:54:32 +00:00
Christopher Ferris
c05ae4824d Merge "Add a binary to dump demangled names."
am: 26afd16917

Change-Id: I5aed9fd1577f8e8223c87050bb11ee3fccd3d30c
2017-03-14 16:49:33 +00:00
Christopher Ferris
26afd16917 Merge "Add a binary to dump demangled names." 2017-03-14 16:44:01 +00:00
Mark Salyzyn
6764737bda Merge changes Iaddc4e1b,I57d84af2 am: fa05eaa968
am: 3790880b9d

Change-Id: I29d44782309a4851605ffd0d0f1f17c4d0860714
2017-03-14 14:56:54 +00:00
Mark Salyzyn
3790880b9d Merge changes Iaddc4e1b,I57d84af2
am: fa05eaa968

Change-Id: Ie83a8c5c72ca15067d2809efdef4b7ff8fe0c4cf
2017-03-14 14:52:26 +00:00