Commit graph

10554 commits

Author SHA1 Message Date
Mark Salyzyn
1ed30702f5 am 6a594683: logcat: document help tail from time
* commit '6a594683ec8aa2c8cee98a95f502772db515e60e':
  logcat: document help tail from time
2014-09-03 05:07:38 +00:00
Mark Salyzyn
be589211b4 am 19e8de07: logd: simplification, return NULL instead of threadexit NULL
* commit '19e8de0742e84355a63feb48b7e1fc6ffbcfbae1':
  logd: simplification, return NULL instead of threadexit NULL
2014-09-03 05:07:38 +00:00
Mark Salyzyn
8149603192 am 3888a4d0: am 35a76df5: Merge "logcat: document help tail from time"
* commit '3888a4d07f7341c103c618f331fb04d93d9c532b':
  logcat: document help tail from time
2014-09-02 22:02:52 +00:00
Mark Salyzyn
3888a4d07f am 35a76df5: Merge "logcat: document help tail from time"
* commit '35a76df583a07524bec5ccaae8082a00e0c06867':
  logcat: document help tail from time
2014-09-02 21:45:15 +00:00
Mark Salyzyn
35a76df583 Merge "logcat: document help tail from time" 2014-09-02 21:35:15 +00:00
Nick Kralevich
042ece12be am 465fc3b9: am 1cbf4329: Merge "Remove obsolete warning from restorecon_recursive documentation."
* commit '465fc3b974384feea3ea991a5e2f801ce1253e2f':
  Remove obsolete warning from restorecon_recursive documentation.
2014-09-02 15:59:17 +00:00
Nick Kralevich
465fc3b974 am 1cbf4329: Merge "Remove obsolete warning from restorecon_recursive documentation."
* commit '1cbf432918a2375378e1762f2f329d17ab7ec765':
  Remove obsolete warning from restorecon_recursive documentation.
2014-09-02 15:52:11 +00:00
Nick Kralevich
1cbf432918 Merge "Remove obsolete warning from restorecon_recursive documentation." 2014-09-02 15:39:07 +00:00
Stephen Smalley
d9c19b0c15 Remove obsolete warning from restorecon_recursive documentation.
We originally included a warning to not invoke restorecon_recursive
with a path leading to a shell-writable or app-writable directory
due to concerns about the potential for mischief with symlinks during
the restorecon_recursive.  However, this warning was never necessary for
calling restorecon_recursive during system initialization before an adb
shell or app can run, and we have further prohibited init from
reading/following symlinks that can be created by shell or apps in
policy, so this warning is superfluous.  It also contradicts current
usage of restorecon_recursive in rootdir/init.rc, since it is called
there on /data.

Change-Id: I28a635e0b5991ced8adcef93e7a04f9d9e5634fd
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-02 09:34:53 -04:00
Mark Salyzyn
190b7ac9d2 logcat: document help tail from time
(cherry picked from commit 6a594683ec)

Bug: 17323719
Change-Id: Id057dde60e699c946828f4aeabedf1728b3bc877
2014-09-01 11:45:53 -07:00
Mark Salyzyn
6a594683ec logcat: document help tail from time
Bug: 17323719
Change-Id: Id057dde60e699c946828f4aeabedf1728b3bc877
2014-09-01 10:42:49 -07:00
Mark Salyzyn
19e8de0742 logd: simplification, return NULL instead of threadexit NULL
Bug: 16822776
Change-Id: I12133226f1b48d8fdc378dea0aadd78a4aae3da8
2014-09-01 10:42:04 -07:00
Elliott Hughes
d546cb59ea am bf921c51: am 7a1973ec: Merge "remove examples of unimplemented triggers ( device-added device-removed ) from init/readme.txt"
* commit 'bf921c5112043b5e39b76e76f38f2818bc904b05':
  remove examples of unimplemented triggers ( device-added device-removed ) from init/readme.txt
2014-08-29 22:38:37 +00:00
Elliott Hughes
bf921c5112 am 7a1973ec: Merge "remove examples of unimplemented triggers ( device-added device-removed ) from init/readme.txt"
* commit '7a1973ece3f3f5e1870f7b169281b48b0ca1cd3c':
  remove examples of unimplemented triggers ( device-added device-removed ) from init/readme.txt
2014-08-29 22:26:51 +00:00
Elliott Hughes
7a1973ece3 Merge "remove examples of unimplemented triggers ( device-added device-removed ) from init/readme.txt" 2014-08-29 22:15:17 +00:00
Trevor Drake
d028394a27 remove examples of unimplemented triggers ( device-added device-removed )
from init/readme.txt

Change-Id: I16e226d8f563a223ae20044fff30498883bc4ae2
2014-08-29 20:07:28 +01:00
Alex Light
6d431a6ee4 am c692410e: Change /dalvik-cache to be owned by root.
* commit 'c692410e1607a39cd6d55f4be8164fc630d9772c':
  Change /dalvik-cache to be owned by root.
2014-08-29 18:47:49 +00:00
Elliott Hughes
e10d297e33 am 61b4b809: am d1d11fcb: Merge "Build the optional \'r\' tool separately."
* commit '61b4b8095a4de1e4d8ea27f860c32ea345b37bfa':
  Build the optional 'r' tool separately.
2014-08-29 16:41:04 +00:00
Elliott Hughes
61b4b8095a am d1d11fcb: Merge "Build the optional \'r\' tool separately."
* commit 'd1d11fcbe55ed7c7d49e857565fb2ec06ad5b54c':
  Build the optional 'r' tool separately.
2014-08-29 16:34:23 +00:00
Elliott Hughes
d1d11fcbe5 Merge "Build the optional 'r' tool separately." 2014-08-29 16:27:23 +00:00
Brian Carlstrom
68e0d185f4 am 24d2adba: am 188d4396: Merge "Change /dalvik-cache to be owned by root."
* commit '24d2adba7a2f9caa82a88be70ad2fe7397ab310a':
  Change /dalvik-cache to be owned by root.
2014-08-29 11:39:17 +00:00
Elliott Hughes
660e750b12 Build the optional 'r' tool separately.
You can't use $(TARGET_BUILD_VARIANT) to change how a module
is built like this makefile used to.

Change-Id: Ie6a274cab9a77eb2376a9494e9c17aae8ba0ee0b
Signed-off-by: Olivier Fourdan <olivier.fourdan@intel.com>
Signed-off-by: Guilhem IMBERTON <guilhem.imberton@intel.com>
2014-08-28 20:44:20 -07:00
Brian Carlstrom
24d2adba7a am 188d4396: Merge "Change /dalvik-cache to be owned by root."
* commit '188d4396b8b02d970a129fbcb869daff38ca9232':
  Change /dalvik-cache to be owned by root.
2014-08-29 01:12:09 +00:00
Alex Light
c692410e16 Change /dalvik-cache to be owned by root.
Bug: 16875245

(cherry picked from commit 3878ebd724)

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-28 16:56:36 -07:00
Brian Carlstrom
188d4396b8 Merge "Change /dalvik-cache to be owned by root." 2014-08-28 23:17:06 +00:00
Elliott Hughes
a1e9ced56e am 8e207634: am d5f230af: Merge "Remove descriptions of unimplemented triggers."
* commit '8e207634c89e18a319c6514c39acd5aaff6d8f83':
  Remove descriptions of unimplemented triggers.
2014-08-28 17:15:26 +00:00
Elliott Hughes
8e207634c8 am d5f230af: Merge "Remove descriptions of unimplemented triggers."
* commit 'd5f230af0733f350910901e09ac8c275a388d79f':
  Remove descriptions of unimplemented triggers.
2014-08-28 17:02:56 +00:00
Elliott Hughes
d5f230af07 Merge "Remove descriptions of unimplemented triggers." 2014-08-28 16:48:14 +00:00
Trevor Drake
d4a497714a Remove descriptions of unimplemented triggers.
device-added, device-removed and service-exited were described but
never implemented.

Change-Id: I6fbd05a85576d18d6741fc6dd549acc9132b0531
2014-08-28 15:38:52 +01:00
Narayan Kamath
7ce528eccc am f9e4d727: (-s ours) Merge "Reject zip archives with entry names containing \0." into lmp-dev
* commit 'f9e4d72782e685c00587e09d0e560a49be49ab6c':
  Reject zip archives with entry names containing \0.
2014-08-28 11:43:19 +00:00
Narayan Kamath
f9e4d72782 Merge "Reject zip archives with entry names containing \0." into lmp-dev 2014-08-28 11:20:35 +00:00
Alex Light
3878ebd724 Change /dalvik-cache to be owned by root.
Bug: 16875245

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-27 15:42:19 -07:00
Hans Boehm
d034eb1171 am 424eaece: am 69001e08: Merge "Remove android_... store_barriers and 64-bit atomics."
* commit '424eaece64e3649082a3972a8eebf76a6b403494':
  Remove android_... store_barriers and 64-bit atomics.
2014-08-27 22:09:03 +00:00
Hans Boehm
424eaece64 am 69001e08: Merge "Remove android_... store_barriers and 64-bit atomics."
* commit '69001e08569ec2f23ccb4a8bd087affcc4f1c26c':
  Remove android_... store_barriers and 64-bit atomics.
2014-08-27 21:52:46 +00:00
Hans Boehm
69001e0856 Merge "Remove android_... store_barriers and 64-bit atomics." 2014-08-27 21:44:30 +00:00
Hans Boehm
9959ed9530 Remove android_... store_barriers and 64-bit atomics.
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses.  All users should move
to C11 or C++11 atomics.

Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
2014-08-27 14:15:09 -07:00
Andres Morales
c28be8be68 am 314313a9: Move bootanim and surfaceflinger to class core
* commit '314313a9915c9a274f580c0fcf535a4db2ba0a9a':
  Move bootanim and surfaceflinger to class core
2014-08-26 22:53:21 +00:00
Andres Morales
314313a991 Move bootanim and surfaceflinger to class core
They have no dependencies on /data so can be started early.
This permits us to unmount /data while bootanimation is running,
allowing an uninterrupted first boot encryption sequence.

Bug: 17260550
Change-Id: I323fe23e8cf488d8bc136387efdd9fcea96625eb
2014-08-26 20:09:10 +00:00
Elliott Hughes
2f26c56a49 am 619765d7: am 31e29dbe: Merge "Remove duplication from sendevent.c."
* commit '619765d7364234f5f13c3e2a1d3094be6c6839aa':
  Remove duplication from sendevent.c.
2014-08-26 16:13:02 +00:00
Elliott Hughes
619765d736 am 31e29dbe: Merge "Remove duplication from sendevent.c."
* commit '31e29dbe1e7e8236bc03764f3da0303b207268c6':
  Remove duplication from sendevent.c.
2014-08-26 16:02:30 +00:00
Elliott Hughes
31e29dbe1e Merge "Remove duplication from sendevent.c." 2014-08-26 15:54:51 +00:00
Piotr Jastrzebski
0c1b894b69 Reject zip archives with entry names containing \0.
There should never be a need of an entry name with \0 character.

Bug: 16162465

(cherry picked from commit 78271ba97b)

Change-Id: I68c72fb45e8ec70eb125cfc887488bc18ba5447d
2014-08-26 13:48:44 +01:00
Elliott Hughes
8e947fe716 Remove duplication from sendevent.c.
Change-Id: I402e68f843e9673e1c02e4f84f4832380c0e91ac
2014-08-25 22:16:08 -07:00
Paul Lawrence
a95e10fe31 am a005e779: Merge "Enable not rebooting during default encryption" into lmp-dev
* commit 'a005e7795e3dfb7cc0bd2bc65208d2490bfc89d8':
  Enable not rebooting during default encryption
2014-08-26 04:53:43 +00:00
Dmitriy Ivanov
64362fd2d8 am 1ee7e520: am ec7cc932: Merge "Fix typo: ifndef -> ifneq"
* commit '1ee7e520e2ada9eb6f87f33e1b6d405070bdbd15':
  Fix typo: ifndef -> ifneq
2014-08-26 00:34:55 +00:00
Dmitriy Ivanov
1ee7e520e2 am ec7cc932: Merge "Fix typo: ifndef -> ifneq"
* commit 'ec7cc9326e545f8ad32e03d2416e04850bdd454b':
  Fix typo: ifndef -> ifneq
2014-08-26 00:25:20 +00:00
Dmitriy Ivanov
ec7cc9326e Merge "Fix typo: ifndef -> ifneq" 2014-08-25 23:29:20 +00:00
Dmitriy Ivanov
85af05ae37 Fix typo: ifndef -> ifneq
Change-Id: Id71c70b6fcd2659078a19cc652fd02807372f3a0
2014-08-25 16:26:29 -07:00
Paul Lawrence
a005e7795e Merge "Enable not rebooting during default encryption" into lmp-dev 2014-08-25 20:28:36 +00:00
Paul Lawrence
c23074f386 Enable not rebooting during default encryption
Need to not set this property) during mount, since it can't
be changed later (ro property)

Also no reason to start class main on encryption cycle - we'll
show surfaceflinger, which is enough UI for this short cycle.

Bug: 17041092
Change-Id: Ica5339c54e45716d0fe20e23c0ab857f388d23ed
2014-08-25 19:24:10 +00:00