Commit graph

30945 commits

Author SHA1 Message Date
Mathias Agopian
f520b73103 Get rid of LinearTransform
It had 3 clients
- one in vendor/google_athome which was disabled
- one in a device specific folder, which will die out
- and one in frameworks/base

This reverts commit 6c942304ed.

Test: compile/run
Bug: treble cleanup

Change-Id: Ia76009d550c294198c083cf89718bc498b5c9e3e
2017-03-15 14:16:13 -07:00
Elliott Hughes
819f34a7f3 Merge "Move "fastboot oem" to std::string." am: 54182110ae am: 3547ba5e3f
am: a251228645

Change-Id: Ie567c820645d7be77af2252404b4a2cf707030ac
2017-03-15 18:45:13 +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
401a19845c Merge "Logd: Fix wrong parameters" am: 913ad12543 am: 0daaa5aec8
am: a8fbb17d2d

Change-Id: Ib3099519c8387e47591037ff9e09f253ca25667f
2017-03-15 15:53:44 +00: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
d1f068e2ec Merge "Fix heap-buffer-overflow detected by ASAN." am: 3d028f14c8 am: 591b09650b
am: 99bd60a9eb

Change-Id: I93eb4512a850b49a432573e8f1ee018f770ffcee
2017-03-15 07:03:27 +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
2761540d28 Merge "libcutils: android_reboot: add thermal shutdown command" am: 97a2c49a58 am: 938f80838c
am: 91db71d2a0

Change-Id: I40941643b63050b11fc8e904890de38faa38ba98
2017-03-15 02:29:00 +00: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
8c84020274 Merge "Remove extraneous .clang-format files" am: 41c7bb5055 am: ef3017bdbd
am: a6df649958

Change-Id: I2fe255c5119e4fc152b10bf45b3adc6f952d8430
2017-03-15 01:05:06 +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
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
TreeHugger Robot
e9af468cde Merge changes I459078c4,I36be1b49
* changes:
  storaged: clean up output format
  storaged: replace string functions that can throw exception
2017-03-14 21:13:18 +00: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
b3f516b9b5 Merge "init: fix DumpState() logging" am: f31abeb973 am: a968df9edb
am: 032f0a2655

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

Change-Id: I21dfc0774c923e06e0ae0f18c3d6744d1fb8f5c4
2017-03-14 20:24:46 +00: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
0b34d6ff88 Merge "ueventd: support by-name symlinks for virtual block devices" am: 0b4d34e31c am: 4d003658ec
am: 244f447b65

Change-Id: Idf2ec04703de63bf17f0919e08aab98fbedcd81e
2017-03-14 19:47:13 +00:00
Jin Qian
4bcc8b6526 storaged: clean up output format
make it easy to use scripts parsing output

Test: adb shell storaged -u
Change-Id: I459078c4ddf6e18fe1eb05d25d564e6e6d03e87e
2017-03-14 12:43:40 -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
Jin Qian
9b1aeae730 storaged: replace string functions that can throw exception
android coding style doesn't allow exception handling which leads
to crash when any function throws exception. Replace such functions
in storaged to gracefully handle invalid inputs.

Test: adb shell dumpsys storaged --hours N --time_window 300
Bug: 36131658
Change-Id: I36be1b49c4d9977a01d1bd4c9ca57d49322d95f4
2017-03-14 11:20:02 -07:00
Tom Cherry
4f5206d2ea Merge "init: enable C++17" am: e3aef3dd99 am: e4275b52a8
am: fdad550029

Change-Id: I308ea437c7a5faa76e995200a4506cdf7d47e9ea
2017-03-14 17:30:04 +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
ba77f5e0cb Merge "Add a binary to dump demangled names." am: 26afd16917 am: c05ae4824d
am: 183e8a8125

Change-Id: Iebff2b90fe72d58e6f96c6e398906580ffc38ce6
2017-03-14 16:59:45 +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