Commit Graph

21187 Commits

Author SHA1 Message Date
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
David Pursell cbb5d714d7 Merge "base: add SystemErrorCodeToString() function."
am: 79d8f07a6f

* commit '79d8f07a6f97511397d96dbb0676d710ce604f8c':
  base: add SystemErrorCodeToString() function.
2016-02-01 20:43:28 +00:00
Paul Crowley c3337319ac Merge "On FDE devices, initialize user 0" 2016-02-01 20:41:27 +00:00
David Pursell 79d8f07a6f Merge "base: add SystemErrorCodeToString() function." 2016-02-01 20:39:09 +00:00
David Pursell 5f787ed2b3 base: add SystemErrorCodeToString() function.
Pulls the Windows error string generation out of adb into libbase so
that it can be used by fastboot as well. Also makes a Unix equivalent
that just wraps strerror() so that upcoming fastboot error reporting
code can be platform-independent.

The intent here is just to provide a portable way to report an error to
the user. More general cross-platform error handling is out of scope.

Bug: http://b/26236380
Change-Id: I5a784a844775949562d069bb41dcb0ebd13a32bc
2016-02-01 12:18:26 -08:00
Martijn Coenen b82bab66f3 Reuse mem cgroups for tracking forked PIDs.
It turns out we were using the CPU accounting
cgroups for keeping track of processes that were
forked by an app without the framework's knowledge,
so we could kill all of them reliably (see b/15313911
for context).

Since we want to use memory cgroups for other purposes,
we might as well use memory cgroups for tracking forked
PIDs if they're enabled. This also gets us automatic cleanup
of empty mem cgroups.

Also, removed old mem cgroup mount point that is no
longer used, as well as cgroup release agent code that
we're not using.

Change-Id: I69d5cc31c162ffa49ef6945755f41381e306cc8b
2016-02-01 21:04:24 +01:00
Colin Cross 1eb743ba8b Fix static analyzer issues caught by clang
system/core/libsparse/sparse_read.c:260:51: warning: Dereference of null pointer (loaded from variable 'crc_ptr')
                        ret = process_crc32_chunk(fd, chunk_data_size, *crc_ptr);
system/core/libsparse/sparse_read.c:404:9: warning: Potential leak of memory pointed to by 'buf'
        return 0;

Fixes leak in sparse_file_read_normal, and null pointer dereference
crash if an image with an obsolete CRC chunk was read with CRC checking
disabled.

Bug: 26904425

Change-Id: Ibc72cd37602929ae2c248bea1cdd1d22ea03baaf
2016-02-01 11:19:26 -08:00
Josh Gao da870abcf4 Merge changes I93287b87,I30a3eb0b am: d18aea9974
am: 831bd4f043

* commit '831bd4f0436a81c5ebf9ec4417948b8195cb01d6':
  adb: add nullability specifiers to adb_client.h.
  adb: add adb_get_feature_set.
2016-02-01 18:54:04 +00:00
Josh Gao 831bd4f043 Merge changes I93287b87,I30a3eb0b
am: d18aea9974

* commit 'd18aea99746d9befed6d596521ea3aa10e07d23f':
  adb: add nullability specifiers to adb_client.h.
  adb: add adb_get_feature_set.
2016-02-01 18:52:06 +00:00
Josh Gao d18aea9974 Merge changes I93287b87,I30a3eb0b
* changes:
  adb: add nullability specifiers to adb_client.h.
  adb: add adb_get_feature_set.
2016-02-01 18:48:13 +00:00
Greg Hackmann 40a96e4ba0 init.rc: add missing /dev/fd symlink
The Linux kernel implicitly expects /dev/fd to symlink to /proc/self/fd.

This change fixes the exec/execveat.c kernel selftest.

Change-Id: Ia08d50023336fdbfc098527299c326d9d59039a9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2016-02-01 10:02:19 -08:00
Paul Crowley 5949745534 On FDE devices, initialize user 0
Fix ugly special cases for user 0: initialize them explicitly.

Bug: 26704408
Change-Id: I1b8536b9e5e87ea98b4009a309f2e22c56006651
2016-02-01 16:44:46 +00:00
Josh Gao a166e71e21 adb: add nullability specifiers to adb_client.h.
Change-Id: I93287b876cb06d871b4330d2733ef6f43c58fbbf
2016-01-31 19:22:04 -08:00
Josh Gao f3f6a1d0d4 adb: add adb_get_feature_set.
Extract a feature set getter function from commandline.cpp.

Change-Id: I30a3eb0b060a88379e29be16264637816e378978
2016-01-31 19:12:26 -08:00
Yabin Cui 9efdfdb69f Merge "base: add API to remove file if it exists." am: aef26bb1a4
am: f79a5f513b

* commit 'f79a5f513bc97357316ea2cd3db1b7c1243f462a':
  base: add API to remove file if it exists.
2016-01-30 04:32:59 +00:00
Yabin Cui f79a5f513b Merge "base: add API to remove file if it exists."
am: aef26bb1a4

* commit 'aef26bb1a4adb953f6bbd5a7e01ca964ed3b386d':
  base: add API to remove file if it exists.
2016-01-30 04:31:10 +00:00
Yabin Cui aef26bb1a4 Merge "base: add API to remove file if it exists." 2016-01-30 04:27:44 +00:00
Yabin Cui b6e314aa86 base: add API to remove file if it exists.
It is a function needed in different places like uncrypt, simpleperf.

Bug: 26883096
Change-Id: I26f4f30e8367867a88272625f00858569fc8e950
2016-01-29 19:24:55 -08:00
David Pursell 7fd384bf77 Merge "adb: fix subprocess termination for legacy shell." am: a9352202dd
am: 4c0a6a1677

* commit '4c0a6a16772700146c4edb894af46f90138e9170':
  adb: fix subprocess termination for legacy shell.
2016-01-29 22:20:40 +00:00
David Pursell 4c0a6a1677 Merge "adb: fix subprocess termination for legacy shell."
am: a9352202dd

* commit 'a9352202dd52a404199fbdca160d9d2d0992cf63':
  adb: fix subprocess termination for legacy shell.
2016-01-29 22:18:44 +00:00
David Pursell a9352202dd Merge "adb: fix subprocess termination for legacy shell." 2016-01-29 22:14:46 +00:00
Chris Tate 098a2badd7 Merge "Have init set up the backup stage dir on /cache" 2016-01-29 22:09:00 +00:00
Josh Gao f74da513c8 Merge "adb: SIGWINCH support for Windows" am: c1eb5ba0fb
am: 41b04cf896

* commit '41b04cf89677836dba14903226df5c7a3d39adcd':
  adb: SIGWINCH support for Windows
2016-01-29 22:08:22 +00:00
Josh Gao 41b04cf896 Merge "adb: SIGWINCH support for Windows"
am: c1eb5ba0fb

* commit 'c1eb5ba0fb1414ef471eb9832d82e79ef85d0d89':
  adb: SIGWINCH support for Windows
2016-01-29 22:06:27 +00:00
Josh Gao c1eb5ba0fb Merge "adb: SIGWINCH support for Windows" 2016-01-29 22:01:45 +00:00
Christopher Tate 63c463fe28 Have init set up the backup stage dir on /cache
Bug 26834865

Change-Id: Idc63c1706f68d42b2a9cee05997c63a9bbcb0fb9
2016-01-29 12:47:46 -08:00
Christopher Ferris 4a906e5fb0 Merge "Always have ps output to stdout at least one line." am: 4602f2b77b
am: 94f8442f2e

* commit '94f8442f2e5196cfb38cc8e1d8908396fd9c3a35':
  Always have ps output to stdout at least one line.
2016-01-29 19:16:43 +00:00
Christopher Ferris 94f8442f2e Merge "Always have ps output to stdout at least one line."
am: 4602f2b77b

* commit '4602f2b77b6e8405c5c84e2f67749ba83ed39d6c':
  Always have ps output to stdout at least one line.
2016-01-29 19:14:29 +00:00
Christopher Ferris 4602f2b77b Merge "Always have ps output to stdout at least one line." 2016-01-29 19:11:17 +00:00
Alex Vakulenko 03fbfef45e Merge "metricsd: Removing brillo::Any from weaved\'s public APIs" am: bade73d9b4
am: 56636da1c8

* commit '56636da1c85334b618a3e27d3e5523993c7cbc5d':
  metricsd: Removing brillo::Any from weaved's public APIs
2016-01-29 17:08:23 +00:00