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
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
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
Kenny Root
c6c8b563e6
am cf2b944d: am 5a1d5a8c: Merge "ueventd: call _exit for safety"
...
* commit 'cf2b944df6d744d279a434ec280f9bd8cef03a5b':
ueventd: call _exit for safety
2014-08-25 18:03:27 +00:00
Kenny Root
cf2b944df6
am 5a1d5a8c: Merge "ueventd: call _exit for safety"
...
* commit '5a1d5a8c79d0148291700cc5773a1519f2c6d8eb':
ueventd: call _exit for safety
2014-08-25 17:16:00 +00:00
Kenny Root
5a1d5a8c79
Merge "ueventd: call _exit for safety"
2014-08-25 17:05:37 +00:00
Kenny Root
17baff480a
ueventd: call _exit for safety
...
Make sure to call _exit instead of exit to avoid triggering exit
handlers that may have existed in the parent process.
Print out a log message when forking to process firmware events fails.
Change-Id: I2436bdf85d9a8ea26b718e62023f1dac89864667
2014-08-25 10:05:08 -07:00
Elliott Hughes
a024c2e770
am b48c46bc: am 3cebf9f8: Merge "Add BSD false(1) and true(1)."
...
* commit 'b48c46bcc2986ccb0a2bcac5549285537d8d9d1a':
Add BSD false(1) and true(1).
2014-08-24 08:57:39 +00:00
Elliott Hughes
b48c46bcc2
am 3cebf9f8: Merge "Add BSD false(1) and true(1)."
...
* commit '3cebf9f8c37262ba8c1ec8fcaa7083a6f8d82b77':
Add BSD false(1) and true(1).
2014-08-24 05:28:32 +00:00
Elliott Hughes
3cebf9f8c3
Merge "Add BSD false(1) and true(1)."
2014-08-24 02:54:32 +00:00
Elliott Hughes
50221f5837
Add BSD false(1) and true(1).
...
Bug: 17000769
Change-Id: I6b218b4c2ba3f57d344f60af7a25c45f07091d64
2014-08-22 20:26:23 -07:00
Calin Juravle
29d787b589
am 100386a9: (-s ours) am e0677ccf: Merge "NativeBridge: Tighten security on libnativebridge"
...
* commit '100386a9e75d28942c6aa1e3ac728571f29110d6':
NativeBridge: Tighten security on libnativebridge
2014-08-22 11:50:31 +00:00
Calin Juravle
100386a9e7
am e0677ccf: Merge "NativeBridge: Tighten security on libnativebridge"
...
* commit 'e0677ccf998602e48d3c9777d22c401283464c46':
NativeBridge: Tighten security on libnativebridge
2014-08-22 11:37:12 +00:00
Calin Juravle
e0677ccf99
Merge "NativeBridge: Tighten security on libnativebridge"
2014-08-22 11:31:06 +00:00
Andreas Gampe
049249ce7a
NativeBridge: Tighten security on libnativebridge
...
Do not allow arbitrary paths for the native bridge - only allow
simple names.
Do not allow re-setup of the native bridge.
Bug: 16404669
(cherry picked from commit cd2ef4c1af
)
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-22 01:44:06 -07:00
Andreas Gampe
c029f9d225
am 4089cda0: Merge "NativeBridge: Tighten security on libnativebridge" into lmp-dev
...
* commit '4089cda0ae73e71adb787e595c747846e30730ee':
NativeBridge: Tighten security on libnativebridge
2014-08-22 05:13:50 +00:00
Andreas Gampe
4089cda0ae
Merge "NativeBridge: Tighten security on libnativebridge" into lmp-dev
2014-08-22 04:56:44 +00:00
Andreas Gampe
cd2ef4c1af
NativeBridge: Tighten security on libnativebridge
...
Do not allow arbitrary paths for the native bridge - only allow
simple names.
Do not allow re-setup of the native bridge.
Bug: 16404669
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-21 14:33:44 -07:00
Isaac Katzenelson
2145a6137e
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp
2014-08-21 03:29:59 +00:00
Elliott Hughes
176fe9005d
am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
...
* commit '4592d73e18684b8ba2addb97433eed4cf389e386':
Only the Mac doesn't have open_memstream.
2014-08-21 03:16:26 +00:00
Colin Cross
422bffb240
am 0b12f0a7: Merge "processgroup: close directories opened by removeAllProcessGroups()" into lmp-dev
...
* commit '0b12f0a7d6be18705d1972ef9a047159bb001e8f':
processgroup: close directories opened by removeAllProcessGroups()
2014-08-21 03:06:05 +00:00
Elliott Hughes
4592d73e18
am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
...
* commit 'a59b6ac6973b3f5ce1246bf73969094779436892':
Only the Mac doesn't have open_memstream.
2014-08-21 02:58:30 +00:00
Elliott Hughes
a59b6ac697
Merge "Only the Mac doesn't have open_memstream."
2014-08-21 00:11:41 +00:00
Elliott Hughes
3ff8888f66
Only the Mac doesn't have open_memstream.
...
We should probably move this into art, since they're the only people using it.
Bug: 17164505
Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
2014-08-20 16:16:24 -07:00
Elliott Hughes
3601abb810
am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."
...
* commit 'f7e88e51b31e64e085b3a564f4b1baa8334d63f1':
There's no non-SMP LP64.
2014-08-20 20:49:36 +00:00