Commit graph

21119 commits

Author SHA1 Message Date
Andreas Gampe
7dfcc92bee Init: add OTA directory
Add /data/ota in init so that the right selinux labels are applied.

Bug: 25612095
Change-Id: I8fd093147f8e0a5c3bd1a4007a61b0b759911cf2
2016-01-28 11:42:57 -08:00
Chien-Yu Chen
113f88e365 Merge "Restart cameraserver" 2016-01-28 02:04:44 +00:00
Dimitry Ivanov
3bdb382bad Merge "Add libcamera2ndk.so to the list of public libraries" 2016-01-27 21:39:55 +00:00
Calin Juravle
6a8b22c03d Merge "Revert "nativebrige: log code_cache access errors to stderr as well"" am: 8b999d894f
am: cf0d813e38

* commit 'cf0d813e389da1577fb4249b18e189996f535a2f':
  Revert "nativebrige: log code_cache access errors to stderr as well"
2016-01-27 18:05:37 +00:00
Calin Juravle
cf0d813e38 Merge "Revert "nativebrige: log code_cache access errors to stderr as well""
am: 8b999d894f

* commit '8b999d894fc29d5f1bede1c233fe28e944c28ce9':
  Revert "nativebrige: log code_cache access errors to stderr as well"
2016-01-27 18:02:32 +00:00
Calin Juravle
8b999d894f Merge "Revert "nativebrige: log code_cache access errors to stderr as well"" 2016-01-27 17:58:18 +00:00
Calin Juravle
5e11a2936b Revert "nativebrige: log code_cache access errors to stderr as well"
This reverts commit 6d5017803e.

Bug: 26675310

Change-Id: Id56b5e832c85f01fca0a2198499d24224c5a6878
2016-01-27 17:53:20 +00:00
Kevin Cernekee
89a31c4499 Merge "ueventd.rc: Document the different rule formats for /dev and /sys nodes" am: fa432b0e2f
am: 54b47105ae

* commit '54b47105aea0e93ee287f76d4a4dc6bfe6ddf698':
  ueventd.rc: Document the different rule formats for /dev and /sys nodes
2016-01-26 23:51:38 +00:00
Kevin Cernekee
54b47105ae Merge "ueventd.rc: Document the different rule formats for /dev and /sys nodes"
am: fa432b0e2f

* commit 'fa432b0e2f87e9a029ac0094e5bceaaff258368a':
  ueventd.rc: Document the different rule formats for /dev and /sys nodes
2016-01-26 23:48:43 +00:00
Kevin Cernekee
fa432b0e2f Merge "ueventd.rc: Document the different rule formats for /dev and /sys nodes" 2016-01-26 23:44:56 +00:00
Mark Salyzyn
bd09939e96 Merge "liblog: check getgroups for AID_LOG for AID_LOG_SECURITY" am: b5eb67ff23
am: 2feb98eab3

* commit '2feb98eab32b06e0806988901a6ad122e723533d':
  liblog: check getgroups for AID_LOG for AID_LOG_SECURITY
2016-01-26 23:17:35 +00:00
Mark Salyzyn
2feb98eab3 Merge "liblog: check getgroups for AID_LOG for AID_LOG_SECURITY"
am: b5eb67ff23

* commit 'b5eb67ff237f6b0a68fe78a93e8e5d6b75a05a32':
  liblog: check getgroups for AID_LOG for AID_LOG_SECURITY
2016-01-26 23:13:12 +00:00
Mark Salyzyn
6562d34571 Merge "Revert "logd: security buffer only AID_SYSTEM reader"" am: c85ce9ba8e
am: 55045303f7

* commit '55045303f732f744554f15fce5e09327e3c348a0':
  Revert "logd: security buffer only AID_SYSTEM reader"
2016-01-26 23:04:12 +00:00
Mark Salyzyn
b5eb67ff23 Merge "liblog: check getgroups for AID_LOG for AID_LOG_SECURITY" 2016-01-26 22:54:47 +00:00
Mark Salyzyn
55045303f7 Merge "Revert "logd: security buffer only AID_SYSTEM reader""
am: c85ce9ba8e

* commit 'c85ce9ba8e97b77438624744d679947cf3f55043':
  Revert "logd: security buffer only AID_SYSTEM reader"
2016-01-26 22:44:39 +00:00
Mark Salyzyn
c85ce9ba8e Merge "Revert "logd: security buffer only AID_SYSTEM reader"" 2016-01-26 22:38:58 +00:00
James Hawkins
198f007e21 Merge "bootstat: Hook up bootstat to record the boot complete signal and log boot events in the LOCAL_INIT_RC file, bootstat.rc." am: dac84b5a1a
am: e4d688e27c

* commit 'e4d688e27c0135bfbbc4d6542813cad5c7337df2':
  bootstat: Hook up bootstat to record the boot complete signal and log boot events in the LOCAL_INIT_RC file, bootstat.rc.
2016-01-26 21:56:55 +00:00
Mark Salyzyn
046d676a1e Merge "logd: security buffer only AID_SYSTEM reader" am: 69ce7c5483
am: c3dff7a5dc

* commit 'c3dff7a5dc80cd296df001c7ead8a869ca30e640':
  logd: security buffer only AID_SYSTEM reader
2016-01-26 21:56:48 +00:00
Mark Salyzyn
674ce6ef58 Revert "logd: security buffer only AID_SYSTEM reader"
This reverts commit 756332e88b.

Change-Id: Ib8607ac758b7e88a9db716ec4274ec0e4e3dc596
2016-01-26 21:47:35 +00:00
James Hawkins
e4d688e27c Merge "bootstat: Hook up bootstat to record the boot complete signal and log boot events in the LOCAL_INIT_RC file, bootstat.rc."
am: dac84b5a1a

* commit 'dac84b5a1adf75fd81a7456faac7bf3953e8276a':
  bootstat: Hook up bootstat to record the boot complete signal and log boot events in the LOCAL_INIT_RC file, bootstat.rc.
2016-01-26 21:35:07 +00:00
Mark Salyzyn
9107c462ce liblog: check getgroups for AID_LOG for AID_LOG_SECURITY
Bug: 26792035
Change-Id: I634d3c8f9f3175956bd70e80daa479af40180f90
2016-01-26 13:32:02 -08:00
James Hawkins
dac84b5a1a Merge "bootstat: Hook up bootstat to record the boot complete signal and log boot events in the LOCAL_INIT_RC file, bootstat.rc." 2016-01-26 21:30:55 +00:00
Mark Salyzyn
c3dff7a5dc Merge "logd: security buffer only AID_SYSTEM reader"
am: 69ce7c5483

* commit '69ce7c5483709d2c005ae2c77f89b3c3835e8ba5':
  logd: security buffer only AID_SYSTEM reader
2016-01-26 20:48:13 +00:00
Mark Salyzyn
69ce7c5483 Merge "logd: security buffer only AID_SYSTEM reader" 2016-01-26 20:41:51 +00:00
James Hawkins
6bff639c19 bootstat: Hook up bootstat to record the boot complete signal and log
boot events in the LOCAL_INIT_RC file, bootstat.rc.

This change also creates the /data/misc/bootstat dir during the
filesystem creation block in init.rc.

Bug: 21724738
Change-Id: I2ad6913c0235d5f926c6ef8b3c65d650159c6ed7
2016-01-26 11:23:31 -08:00
Dimitry Ivanov
73d2bc07b2 Add libcamera2ndk.so to the list of public libraries
Bug: http://b/23012001
Change-Id: If5bfd9ea15fcfe508aee4731d7f84fe517bfb43e
2016-01-26 10:49:24 -08:00
Mark Salyzyn
756332e88b logd: security buffer only AID_SYSTEM reader
Bug: 26029733
Change-Id: I140e5eb8bb39271fa674744651127e3fc545cbe8
2016-01-26 07:20:29 -08:00
Alex Deymo
94ac86a38c Merge "Add BinPackArguments: false to .clang-format" am: 1503538869
am: a64c980da9

* commit 'a64c980da92b0ead65756d4e4644a37721673383':
  Add BinPackArguments: false to .clang-format
2016-01-26 03:15:29 +00:00
Alex Deymo
a64c980da9 Merge "Add BinPackArguments: false to .clang-format"
am: 1503538869

* commit '15035388694f92d84576aeeb0837e0d928250a59':
  Add BinPackArguments: false to .clang-format
2016-01-26 03:12:54 +00:00
Alex Deymo
1503538869 Merge "Add BinPackArguments: false to .clang-format" 2016-01-26 02:57:34 +00:00
Christopher Ferris
d54822181f Merge "Put BacktraceOffline code into a separate library." am: 9adbf681a0
am: 8296607568

* commit '8296607568288f83e286c1c8e597fc7239a7f40a':
  Put BacktraceOffline code into a separate library.
2016-01-26 01:59:16 +00:00
Christopher Ferris
8296607568 Merge "Put BacktraceOffline code into a separate library."
am: 9adbf681a0

* commit '9adbf681a0780e2bb3e791fad82dcd555aeaca84':
  Put BacktraceOffline code into a separate library.
2016-01-26 01:57:00 +00:00
Christopher Ferris
9adbf681a0 Merge "Put BacktraceOffline code into a separate library." 2016-01-26 01:50:25 +00:00
Alex Deymo
d830612305 Add BinPackArguments: false to .clang-format
Without this setting, arguments passed to a function can be packed in
more than one line, with more than one argument per line.

For example, the following code will be formated as this without the
BinPackArguments:

  CallMyFunction(
    with_more_than_one, argument_per_line,
    event_they_dont_fit_in_a_single_line);

On the other hand, with BinPackArguments: false, that code will be
split in:
  CallMyFunction(
    with_more_than_one,
    argument_per_line,
    event_they_dont_fit_in_a_single_line);

or all the arguments in the same line if they all fit.

Bug: None
TEST=None

Change-Id: I48627e66e2a841f89418c0763e7fe6c3e6ea7387
2016-01-25 17:46:21 -08:00
Christopher Ferris
8540216028 Put BacktraceOffline code into a separate library.
BacktraceOffline is the only code that uses libLLVM. Create
a new shared library, backtrace_offline.so, that references this
so that including libbacktrace.so doesn't wind up pulling in libLLVM.

Change-Id: I90c502d833f6c464c3810dffde52a0c6da241cce
2016-01-25 16:26:48 -08:00
Mark Salyzyn
e32c4655b1 Merge "logd: test wrap functionality" am: 1c92d83cda
am: 8ef22e432b

* commit '8ef22e432b18a7c39d4e791ef47eb655bcfd2adc':
  logd: test wrap functionality
2016-01-25 22:51:00 +00:00
Mark Salyzyn
8ef22e432b Merge "logd: test wrap functionality"
am: 1c92d83cda

* commit '1c92d83cdaf78b4f9ef9069f7774851e77b327e7':
  logd: test wrap functionality
2016-01-25 22:48:51 +00:00
Mark Salyzyn
1c92d83cda Merge "logd: test wrap functionality" 2016-01-25 22:45:28 +00:00
Chien-Yu Chen
cd2ef4ef1c Restart cameraserver
Bug: 24511454
Change-Id: Ia27f4ef0eb71f891c789f637a21b04afe0b1c4e9
2016-01-25 11:52:40 -08:00
Josh Gao
62b3a94ce1 Merge "Use dlmalloc from external/dlmalloc instead of bionic/." am: 506d233e7a
am: 7f3dd26610

* commit '7f3dd26610c018c05d93480d8af2c4a813507efc':
  Use dlmalloc from external/dlmalloc instead of bionic/.
2016-01-25 18:53:01 +00:00
Josh Gao
7f3dd26610 Merge "Use dlmalloc from external/dlmalloc instead of bionic/."
am: 506d233e7a

* commit '506d233e7ac8ca4efa80768153d842c296477f99':
  Use dlmalloc from external/dlmalloc instead of bionic/.
2016-01-25 18:50:42 +00:00
Tim Murray
1293fed9a3 Merge "Improve cpuset support for surfaceflinger." 2016-01-25 18:45:01 +00:00
Josh Gao
506d233e7a Merge "Use dlmalloc from external/dlmalloc instead of bionic/." 2016-01-25 18:42:54 +00:00
Tom Cherry
6ddde53e8e Merge "init: Update readme.txt to reflect recent changes to init" am: d401eba04c
am: 9262e5fdcd

* commit '9262e5fdcd77e296bd71dbc1c9448a347a851789':
  init: Update readme.txt to reflect recent changes to init
2016-01-25 18:22:24 +00:00
Tom Cherry
9262e5fdcd Merge "init: Update readme.txt to reflect recent changes to init"
am: d401eba04c

* commit 'd401eba04c26bc4ce8b020fb683a93694672fb1b':
  init: Update readme.txt to reflect recent changes to init
2016-01-25 18:20:02 +00:00
Tom Cherry
d401eba04c Merge "init: Update readme.txt to reflect recent changes to init" 2016-01-25 18:15:33 +00:00
Marco Nelissen
0b17e3a362 Merge "uid for codec process" am: c7096b5e42
am: e40b58328f

* commit 'e40b58328f13c19d4954c760f7c7f7f86a8f2aa1':
  uid for codec process
2016-01-25 16:57:18 +00:00
Marco Nelissen
e40b58328f Merge "uid for codec process"
am: c7096b5e42

* commit 'c7096b5e42466b6ca627c0d0829064fd21ec4483':
  uid for codec process
2016-01-25 16:55:32 +00:00
Marco Nelissen
c7096b5e42 Merge "uid for codec process" 2016-01-25 16:51:05 +00:00
Marco Nelissen
003c07238a uid for codec process
Change-Id: Iadf8012e6c177bcf487048e1b5a9b4fc51a0aeba
2016-01-25 07:49:39 -08:00