Paul Lawrence
1446f0f318
Merge "Remove code to handle non-default file encryption"
2016-02-02 23:16:02 +00:00
Elliott Hughes
edbc3af294
Merge "init: Fix load_firmware error" am: f330e5462d
...
am: de0af89c82
* commit 'de0af89c8253ecda179c35cb8c62c592b91e46ae':
init: Fix load_firmware error
2016-02-02 22:54:32 +00:00
Elliott Hughes
de0af89c82
Merge "init: Fix load_firmware error"
...
am: f330e5462d
* commit 'f330e5462d200080d1694834282afadc018060e1':
init: Fix load_firmware error
2016-02-02 22:47:36 +00:00
Elliott Hughes
f330e5462d
Merge "init: Fix load_firmware error"
2016-02-02 22:44:01 +00:00
Mark Salyzyn
af86f6e093
Merge "libcutils: ashmem fortify and comply with Android coding standard" am: 0e0a4628f6
...
am: a9bb866861
* commit 'a9bb866861766305482757d90b9263dcd648b90e':
libcutils: ashmem fortify and comply with Android coding standard
2016-02-02 21:40:59 +00:00
Mark Salyzyn
a9bb866861
Merge "libcutils: ashmem fortify and comply with Android coding standard"
...
am: 0e0a4628f6
* commit '0e0a4628f6af7dc5f39d745098143699257dfbe6':
libcutils: ashmem fortify and comply with Android coding standard
2016-02-02 21:38:19 +00:00
Mark Salyzyn
0e0a4628f6
Merge "libcutils: ashmem fortify and comply with Android coding standard"
2016-02-02 21:31:01 +00:00
Elliott Hughes
1ee7abd066
Merge "Start debuggerd as soon as logd is up." am: 1b729b3e04
...
am: 1ef5b78a2f
* commit '1ef5b78a2ffc471e5ac2e30b424f00d15d581a8c':
Start debuggerd as soon as logd is up.
2016-02-02 21:12:49 +00:00
Elliott Hughes
1ef5b78a2f
Merge "Start debuggerd as soon as logd is up."
...
am: 1b729b3e04
* commit '1b729b3e04b210d096ee2d447945f6b2c53b6029':
Start debuggerd as soon as logd is up.
2016-02-02 21:10:47 +00:00
Elliott Hughes
1b729b3e04
Merge "Start debuggerd as soon as logd is up."
2016-02-02 21:05:56 +00:00
Elliott Hughes
2f74a5dae5
Start debuggerd as soon as logd is up.
...
Makes debugging early boot crashes easier.
Bug: http://b/26918597
Change-Id: I5bb883f1350ea5f7a545cb0e9f1034ecfcf47cdb
2016-02-02 13:03:41 -08:00
Mark Salyzyn
c2d8aad8d7
libcutils: ashmem fortify and comply with Android coding standard
...
- sort header order and in groups
- remove all tabs, use only spaces
- use TEMP_FAILURE_RETRY in system calls
- preserve errno for -1 return
Bug: 26871259
Change-Id: I94fffbcaeba01fcc18a3ed07c02389c06c54d3b7
2016-02-02 12:38:06 -08:00
Dimitry Ivanov
4e9bda3873
Merge "Include icu4c libraries to the list of public libs" am: 17e33647f0
...
am: 819da66bec
* commit '819da66bec28c31d564ba695d4d32f1a4727cad1':
Include icu4c libraries to the list of public libs
2016-02-02 20:10:12 +00:00
Dimitry Ivanov
819da66bec
Merge "Include icu4c libraries to the list of public libs"
...
am: 17e33647f0
* commit '17e33647f0df458cd02e81751bd2e9eaac922009':
Include icu4c libraries to the list of public libs
2016-02-02 20:08:08 +00:00
Dimitry Ivanov
17e33647f0
Merge "Include icu4c libraries to the list of public libs"
2016-02-02 20:03:28 +00:00
David Pursell
4659c63114
Merge "fastboot: socket testing improvements." am: f971b6a24b
...
am: fe12d889e4
* commit 'fe12d889e41b688a84b4727126fde66011ca0ae6':
fastboot: socket testing improvements.
2016-02-02 19:44:03 +00:00
David Pursell
fe12d889e4
Merge "fastboot: socket testing improvements."
...
am: f971b6a24b
* commit 'f971b6a24b2d785187cf98cb002b9aee9ab6b2a7':
fastboot: socket testing improvements.
2016-02-02 19:41:21 +00:00
David Pursell
f971b6a24b
Merge "fastboot: socket testing improvements."
2016-02-02 19:36:44 +00:00
David Pursell
c3a466960f
fastboot: socket testing improvements.
...
(This code was originally part of a huge fastboot CL but has been split
out to try to make the CLs a little more manageable).
More prep for fastboot TCP and UDP implementations. This CL adds a
SocketMock class that makes it easy to mock out network behavior so we
can unit test the TCP and UDP protocols.
Also uses the new libcutils socket_get_local_port() to avoid hardcoding
a server port in unit tests.
Bug: http://b/26157893 .
Change-Id: I1ba10f31e98d7349313fc15f240383d63378a8db
2016-02-02 11:29:10 -08:00
David Pursell
2fe3a0b7a4
Merge "libcutils: add multi-buffer socket send." am: d95ecfc432
...
am: d56499b21d
* commit 'd56499b21d1411a7c799cdad316fb2138db26a7c':
libcutils: add multi-buffer socket send.
2016-02-02 19:25:52 +00:00
David Pursell
d56499b21d
Merge "libcutils: add multi-buffer socket send."
...
am: d95ecfc432
* commit 'd95ecfc432206d5408738bb7cbc6eb15e5827d91':
libcutils: add multi-buffer socket send.
2016-02-02 19:23:51 +00:00
David Pursell
e03df480b1
Merge "libcutils: add socket_get_local_port()." am: d90adbc45b
...
am: 9875e6c7e3
* commit '9875e6c7e318fe11a888b6b53c0472f5586410e4':
libcutils: add socket_get_local_port().
2016-02-02 19:21:39 +00:00
David Pursell
d95ecfc432
Merge "libcutils: add multi-buffer socket send."
2016-02-02 19:20:07 +00:00
David Pursell
9875e6c7e3
Merge "libcutils: add socket_get_local_port()."
...
am: d90adbc45b
* commit 'd90adbc45b905dcf3e5cddcd2908b9307fc2a332':
libcutils: add socket_get_local_port().
2016-02-02 19:19:27 +00:00
David Pursell
8385fb299f
libcutils: add multi-buffer socket send.
...
Unix and Windows both have functions to write multiple buffers to a
socket with a single call but they have very different signatures. This
CL creates some cross-platform functions to be able to perform these
operations in a uniform way, which will be required for upcoming
fastboot functionality.
This CL also fixes some inconsistent spacing in the touched files.
Bug: http://b/26558551
Change-Id: I8f14d52d3a1de1f3b464267666d6cd3b54263238
2016-02-02 11:18:56 -08:00
Dimitry Ivanov
c24ca894f5
Include icu4c libraries to the list of public libs
...
Note that with this change the linker will ignore
icu libraries provided by an app because public
libraries are always provided by system. At this point
it does not affect any apps because before Marshmallow
all of them were getting platform version of icu4c
libs anyways (they will be getting their own copy of the
library only in Marshmallow release).
Bug: http://b/26217329
Bug: http://b/26929349
Change-Id: I681cab43c9f28ec22319d9f0424bd3df00743a5f
2016-02-02 11:06:31 -08:00
David Pursell
d90adbc45b
Merge "libcutils: add socket_get_local_port()."
2016-02-02 19:06:02 +00:00
Paul Lawrence
69080180ce
Remove code to handle non-default file encryption
...
Change-Id: I6d986853929c0237c0d958329b8e9aab47907a00
2016-02-02 10:34:40 -08:00
David Pursell
756e1c81e8
libcutils: add socket_get_local_port().
...
Tests that require a local server currently hardcode a test value,
which can run into conflicts depending on what's currently running on
the machine.
This CL adds socket_get_local_port(), which lets us pass 0 so the
system picks an open port and we can query which port it chose.
Bug: http://b/26236380
Change-Id: I01d1558884e7636081d9a357db6faa86929934f6
2016-02-02 09:52:02 -08:00
Martijn Coenen
2f07673957
Merge "Reuse mem cgroups for tracking forked PIDs."
2016-02-02 10:23:57 +00:00
Yabin Cui
699709c593
Merge "Fix for host simpleperf \'gettid\' unsat." am: 650f6809a3
...
am: 2abff32d30
* commit '2abff32d30745ec496a22f8950abc133934b63a4':
Fix for host simpleperf 'gettid' unsat.
2016-02-02 09:13:35 +00:00
Tim Murray
88185f9ee8
Merge "Enable top-app cpuset support."
2016-02-02 02:13:31 +00:00
Yabin Cui
2abff32d30
Merge "Fix for host simpleperf \'gettid\' unsat."
...
am: 650f6809a3
* commit '650f6809a39d8116f8f13f527c65372b80070f5e':
Fix for host simpleperf 'gettid' unsat.
2016-02-02 02:10:22 +00:00
Yabin Cui
650f6809a3
Merge "Fix for host simpleperf 'gettid' unsat."
2016-02-02 02:06:22 +00:00
Tim Murray
6647bb5130
Enable top-app cpuset support.
...
Allows ActivityManager to use the top-app cpuset to grant the currently
focused app exclusive access to a CPU core.
Change-Id: I45bca5170477e413dec6e5889338399d0859706c
2016-02-01 15:03:16 -08:00
Mark Salyzyn
e7b92201d4
Merge "logd: security buffer only AID_SYSTEM reader" am: ef68c867ac
...
am: 1f26d0b73e
* commit '1f26d0b73e7ba506e88b1f4b150136d3d6f794fc':
logd: security buffer only AID_SYSTEM reader
2016-02-01 22:38:45 +00:00
Mark Salyzyn
1f26d0b73e
Merge "logd: security buffer only AID_SYSTEM reader"
...
am: ef68c867ac
* commit 'ef68c867ac220f21e86a44fda9f501359425cae5':
logd: security buffer only AID_SYSTEM reader
2016-02-01 22:36:47 +00:00
Mark Salyzyn
ef68c867ac
Merge "logd: security buffer only AID_SYSTEM reader"
2016-02-01 22:32:26 +00:00
Greg Hackmann
7026d48d84
Merge "init.rc: add missing /dev/fd symlink" am: 54bf0718f4
...
am: ef605cb749
* commit 'ef605cb7495cec368f7be015f924479969dd8fc2':
init.rc: add missing /dev/fd symlink
2016-02-01 22:07:42 +00:00
Greg Hackmann
ef605cb749
Merge "init.rc: add missing /dev/fd symlink"
...
am: 54bf0718f4
* commit '54bf0718f4eb1b170f55bbd07207cd6ad2e7e0f5':
init.rc: add missing /dev/fd symlink
2016-02-01 22:04:06 +00:00
Greg Hackmann
54bf0718f4
Merge "init.rc: add missing /dev/fd symlink"
2016-02-01 21:58:33 +00:00
Mark Salyzyn
8fa8896d2e
logd: security buffer only AID_SYSTEM reader
...
- limit AID_SYSTEM uid or gid to read security buffer messages
- adjust liblog tests to reflect the reality of this adjustment
To fully test all security buffer paths and modes
$ su 0,0,0 /data/nativetest/liblog-unit-tests/liblog-unit-tests --gtest_filter=liblog.__security*
$ su 1000,1000,1000 /data/nativetest/liblog-unit-tests/liblog-unit-tests --gtest_filter=liblog.__security*
$ su 2000,2000,2000 /data/nativetest/liblog-unit-tests/liblog-unit-tests --gtest_filter=liblog.__security*
ToDo: Integrate the above individually into the gTest Q/A testing
Bug: 26029733
Change-Id: Idcf5492db78fa6934ef6fb43f3ef861052675651
2016-02-01 13:29:06 -08:00
Colin Cross
5fff7da71e
Merge "Fix static analyzer issues caught by clang" am: c2c0df900d
...
am: d484e7cef5
* commit 'd484e7cef56133e1957e63f7de3bb6e47602fa85':
Fix static analyzer issues caught by clang
2016-02-01 21:24:43 +00:00
Colin Cross
d484e7cef5
Merge "Fix static analyzer issues caught by clang"
...
am: c2c0df900d
* commit 'c2c0df900ded71aa3f7c9aee05614c7c050eef06':
Fix static analyzer issues caught by clang
2016-02-01 21:21:30 +00:00
Colin Cross
c2c0df900d
Merge "Fix static analyzer issues caught by clang"
2016-02-01 21:16:20 +00:00
Than McIntosh
1e0fea291a
Fix for host simpleperf 'gettid' unsat.
...
Bug: 26900419
Change-Id: Ifefd017f4b62ecfb2521bd1c38dbb3b09054f205
2016-02-01 15:59:40 -05:00
David Pursell
fc04da8540
Merge "adb: win32: handle incomplete UTF-8 in console output, other fixes" am: 85c65dab42
...
am: 8467ab758c
* commit '8467ab758ccc99391dddfc875377052d89f46697':
adb: win32: handle incomplete UTF-8 in console output, other fixes
2016-02-01 20:57:04 +00:00
David Pursell
8467ab758c
Merge "adb: win32: handle incomplete UTF-8 in console output, other fixes"
...
am: 85c65dab42
* commit '85c65dab429f1f47b6f07e26f9637084fb314eb5':
adb: win32: handle incomplete UTF-8 in console output, other fixes
2016-02-01 20:54:26 +00:00
David Pursell
85c65dab42
Merge "adb: win32: handle incomplete UTF-8 in console output, other fixes"
2016-02-01 20:49:25 +00:00
David Pursell
488275b8f6
Merge "base: add SystemErrorCodeToString() function." am: 79d8f07a6f
...
am: cbb5d714d7
* commit 'cbb5d714d79dbc785a90fd17082227321cee9d92':
base: add SystemErrorCodeToString() function.
2016-02-01 20:45:39 +00:00