Commit graph

25592 commits

Author SHA1 Message Date
Martijn Coenen
ac129cbaa2 Add hwbinder dev node permissions. am: f5110ea029 am: a2249bc1bd
am: 2008af6af5

Change-Id: I18c7c1b8b372f59f609e12a2532bd9e435e1ba81
2016-09-27 00:16:46 +00:00
Martijn Coenen
2008af6af5 Add hwbinder dev node permissions. am: f5110ea029
am: a2249bc1bd

Change-Id: I77503d0b9382a1921877b39acc6d5f8bacbbd897
2016-09-27 00:12:17 +00:00
Martijn Coenen
a2249bc1bd Add hwbinder dev node permissions.
am: f5110ea029

Change-Id: I67ee1a3ca8a1e226f7487b33fda21943ca77b696
2016-09-27 00:08:19 +00:00
Elliott Hughes
9daaf229d0 Merge "Switch adb to <android-base/properties.h>." am: d9a23b5733 am: 5dc7e6a79a
am: 8b7751d360

Change-Id: Ie02bbd139d522d930649ecb06da3f853d6995034
2016-09-26 22:25:21 +00:00
Elliott Hughes
8b7751d360 Merge "Switch adb to <android-base/properties.h>." am: d9a23b5733
am: 5dc7e6a79a

Change-Id: Ie2718d9f843b11feca003805569bb35acde62463
2016-09-26 22:22:48 +00:00
Elliott Hughes
5dc7e6a79a Merge "Switch adb to <android-base/properties.h>."
am: d9a23b5733

Change-Id: I09a1832143d9f54cd67128602c9e518a1b398b5c
2016-09-26 22:19:04 +00:00
Treehugger Robot
d9a23b5733 Merge "Switch adb to <android-base/properties.h>." 2016-09-26 21:58:16 +00:00
Robb Glasser
df70b14c2c Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev am: bba43b374b
am: 2baa65a507

Change-Id: I0b748f49d733e37e6b1f58beac1dfb5ccf6acdd3
2016-09-26 21:26:23 +00:00
Thierry Strudel
55cec58703 [DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available am: 738e0dcf0a
am: 5f4db94228

Change-Id: I05fbf1cffb44595d354219b1753cd7c2b37e10db
2016-09-26 21:25:32 +00:00
Robb Glasser
2baa65a507 Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev
am: bba43b374b

Change-Id: I0a481621a85ff28894518b0c7357b19c1df6eec0
2016-09-26 21:23:57 +00:00
Thierry Strudel
5f4db94228 [DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available
am: 738e0dcf0a

Change-Id: I9de236b53b4f4f449de65bfb856771278b92fa9e
2016-09-26 21:23:02 +00:00
Mitchell Wills
3cca209b91 Merge "Add fastboot --skip-reboot flag" am: 60a99eb8f7 am: d62dcfa03f
am: d21bc6ac81

Change-Id: I7cef28ceecf147213eb332e3cce48f59f09474cd
2016-09-26 21:17:53 +00:00
Robb Glasser
bba43b374b Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev 2016-09-26 21:15:24 +00:00
Mitchell Wills
d21bc6ac81 Merge "Add fastboot --skip-reboot flag" am: 60a99eb8f7
am: d62dcfa03f

Change-Id: Ib51c3f98488c2c389efb1590ef650c5ebd0194b5
2016-09-26 21:15:23 +00:00
Mitchell Wills
d62dcfa03f Merge "Add fastboot --skip-reboot flag"
am: 60a99eb8f7

Change-Id: Id3ee7f6603437fae7ed26e8af93235f6531e0219
2016-09-26 21:13:23 +00:00
Treehugger Robot
60a99eb8f7 Merge "Add fastboot --skip-reboot flag" 2016-09-26 21:08:07 +00:00
Elliott Hughes
ffdec18017 Switch adb to <android-base/properties.h>.
Bug: http://b/23102347
Test: manual
Change-Id: Iffa66258c01f84f41b9af99ab5e768a0a2669106
2016-09-26 13:14:14 -07:00
Mitchell Wills
31dce302db Add fastboot --skip-reboot flag
Add a flag to fastboot that will cause it to not reboot the device after
performing commands like update and flashall.

Fixed: 31743001
Test: run fastboot update with and without --skip-reboot flag
Change-Id: I7f4056249a52779c7fc752c9d1009a58a44762df
2016-09-26 11:27:16 -07:00
Martijn Coenen
f5110ea029 Add hwbinder dev node permissions.
b/31458381
Test: pass

Change-Id: I8ec92a29287b17636c363c55a8565dacab19043d
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-09-26 00:23:51 -07:00
Andreas Gampe
1160b42e1b Merge "Base: Remove LOG_S variants." am: aa00f5852f am: 8ca0a71c51
am: b98acabcad

Change-Id: Iab564ecfc74e12b4f3a3d2a3271657398b9de1ee
2016-09-26 00:47:07 +00:00
Andreas Gampe
b98acabcad Merge "Base: Remove LOG_S variants." am: aa00f5852f
am: 8ca0a71c51

Change-Id: Idcb11642acb230afe2f509ad75451729249bea86
2016-09-26 00:44:59 +00:00
Andreas Gampe
8ca0a71c51 Merge "Base: Remove LOG_S variants."
am: aa00f5852f

Change-Id: Iac81601db10497ac7416752c25cc4cddb3434756
2016-09-26 00:42:28 +00:00
Treehugger Robot
aa00f5852f Merge "Base: Remove LOG_S variants." 2016-09-26 00:37:13 +00:00
Andreas Gampe
1f5fb43047 Base: Remove LOG_S variants.
Partially reverts commit 436f5a031f.

Remove the variants taking a fully qualified LogSeverity. Instead
use a lambda with "using" statements to translate both qualified
and unqualified names into valid expressions.

Compile-time regression was measured as 0.1s for a thousand LOG
statements on a z840.

Update tests.

Bug: 31338270
Test: m
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: I36fdf30a9d535b19543307b85d1b3c19a97f20dd
2016-09-24 10:18:38 -07:00
Elliott Hughes
3226b9f327 Merge "Add std::string system property functions." am: 3f049c3f19 am: 621127a2cb
am: 8fb1552b1f

Change-Id: I2907f254331a8739dcf09152271ceda009875367
2016-09-24 05:04:05 +00:00
Elliott Hughes
8fb1552b1f Merge "Add std::string system property functions." am: 3f049c3f19
am: 621127a2cb

Change-Id: I95ad7284a08d9903bd9712653ad225588ca6fb47
2016-09-24 05:01:56 +00:00
Elliott Hughes
621127a2cb Merge "Add std::string system property functions."
am: 3f049c3f19

Change-Id: Ib8c802c8c4e00e7b601c5eb1e6d64693954f5b94
2016-09-24 04:59:55 +00:00
Treehugger Robot
3f049c3f19 Merge "Add std::string system property functions." 2016-09-24 04:52:59 +00:00
Andreas Gampe
36055f1def Merge "Base: Check severity in destructor" am: 19a7696488 am: 1f03df8155
am: dee214ba77

Change-Id: I47256df073b07427c7ed9ed44c2ccea9853a773c
2016-09-23 23:20:06 +00:00
Andreas Gampe
dee214ba77 Merge "Base: Check severity in destructor" am: 19a7696488
am: 1f03df8155

Change-Id: Ib81ada30737497c41ba20d81b7e52fdf736e1a14
2016-09-23 23:18:50 +00:00
Andreas Gampe
1f03df8155 Merge "Base: Check severity in destructor"
am: 19a7696488

Change-Id: I07f89e907304d754523f9026f857b5c94601b6e3
2016-09-23 23:15:49 +00:00
Treehugger Robot
19a7696488 Merge "Base: Check severity in destructor" 2016-09-23 23:12:09 +00:00
David Pursell
7bc0052ff1 Merge "Flattenable: switch from assignment to memcpy()." am: b2356a6993 am: bb276d8555
am: 9f106bece8

Change-Id: I43e4e5c6bb0aa1fd23a1d0d9776c9e2c8028527e
2016-09-23 22:56:01 +00:00
David Pursell
9f106bece8 Merge "Flattenable: switch from assignment to memcpy()." am: b2356a6993
am: bb276d8555

Change-Id: I2d7317f601dcfc85705f2e71408c314de55a0f69
2016-09-23 22:53:48 +00:00
David Pursell
bb276d8555 Merge "Flattenable: switch from assignment to memcpy()."
am: b2356a6993

Change-Id: I3d4cb834d67693c65e71af6a7c360eb82b31b055
2016-09-23 22:51:49 +00:00
David Pursell
b2356a6993 Merge "Flattenable: switch from assignment to memcpy()." 2016-09-23 22:46:03 +00:00
Elliott Hughes
1e88c8c0ac Add std::string system property functions.
Makes it easier to write correct code in a world where the maximum
property key/value lengths change.

Bug: http://b/23102347
Test: libbase_test64
Change-Id: I100f00904221bbcef9e8786a4e6e30428039bb49
2016-09-23 15:30:22 -07:00
Colin Cross
8e3427fb04 Merge "Move android_get_control_socket out of line" am: 4b5abcdba2 am: 4873829953
am: ea2b61c7a8

Change-Id: Ib406546b998d6d525829f0023a5f693c2e1dfd6c
2016-09-23 21:00:41 +00:00
Colin Cross
ea2b61c7a8 Merge "Move android_get_control_socket out of line" am: 4b5abcdba2
am: 4873829953

Change-Id: I45e8b86e43a47213664acf486a5de266bab6deb8
2016-09-23 20:58:40 +00:00
David Pursell
2ebce7384b Flattenable: switch from assignment to memcpy().
FlattenableUtils read() and write() currently use assignment to copy
bytes. However, by casting the void* buffer to type T, the compiler is
allowed to assume that buffer obeys the alignment requirements of T,
which is not necessarily the case during serialization. On some
architectures, we can get SIGBUS when this alignment is violated.

We don't want the users of these routines to have to worry about
alignment when packing structures, so use memcpy() instead which should
always be safe since the compiler won't assume any alignment for the
void* buffer.

On architectures that can handle unaligned direct read/write of type T,
the compiler should be smart enough to optimize this code back to a
direct read/write anyway, but architectures that can't handle it will
fall back to memcpy; this means that this change shouldn't have any
impact on current Android devices. See the linked bug for more details.

Bug: http://b/31671510
Test: libgui Sensor serialization no longer gives SIGBUS.
Test: libgui.so unchanged on Shamu before and after this CL.
Change-Id: I2197127e8cbfb43f4f553bda6464f6ebe087febd
2016-09-23 13:56:40 -07:00
Colin Cross
4873829953 Merge "Move android_get_control_socket out of line"
am: 4b5abcdba2

Change-Id: If427dfca41a23d94f2f026edbeb0dc8cd73a4724
2016-09-23 20:56:39 +00:00
Treehugger Robot
4b5abcdba2 Merge "Move android_get_control_socket out of line" 2016-09-23 20:49:19 +00:00
Andreas Gampe
19ff8f1e57 Base: Check severity in destructor
Bug: 31338270
Test: m
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: Ic077822bcfd591bd11f4fa9d4b6e440b461c70c1
2016-09-23 13:31:52 -07:00
Colin Cross
e8ffa449fd Move android_get_control_socket out of line
android_get_control_socket has a warning from the implicit cast from
long to int.  The warning was being hidden because cutils/sockets.h was
included with -isystem.  Move android_get_control_socket to sockets.cpp,
since we don't want header only dependencies anyways, and fix the
warning with a range check and a static_cast.

Bug: 31492149
Test: m -j <module that uses sockets.h and -Wall>
Change-Id: I1f394ab26d4ec8a7dd0e7907c10416d7f8647624
2016-09-23 11:26:08 -07:00
Mitchell Wills
a0a91241af Merge "Give wifi_hal_legacy access to netlink" am: 6fc7eaaad0 am: c3d7cb95cc
am: 9fef925542

Change-Id: I3e4439c4a873284d7dce3cab7c564d2c8c2991df
2016-09-23 16:37:01 +00:00
Mitchell Wills
9fef925542 Merge "Give wifi_hal_legacy access to netlink" am: 6fc7eaaad0
am: c3d7cb95cc

Change-Id: Id566bf979c479140de3316e945b43e3212f458cc
2016-09-23 16:35:01 +00:00
Mitchell Wills
c3d7cb95cc Merge "Give wifi_hal_legacy access to netlink"
am: 6fc7eaaad0

Change-Id: Ia3a6d48dab8123a5dc4e42d4b0d271d2e2c880e2
2016-09-23 16:32:57 +00:00
Treehugger Robot
6fc7eaaad0 Merge "Give wifi_hal_legacy access to netlink" 2016-09-23 16:27:41 +00:00
Andreas Gampe
9ce7b8f21b Merge "Base: Add more log macros" am: 58af713d8a am: 9148006e85
am: 4939e19354

Change-Id: Iafa634da74d64c8099425201b15d5dbb90434507
2016-09-23 00:15:45 +00:00
Andreas Gampe
4939e19354 Merge "Base: Add more log macros" am: 58af713d8a
am: 9148006e85

Change-Id: Ib18375fd6bef00321b5ee7b2e866554b389ffa58
2016-09-23 00:03:26 +00:00