Ken Sumrall
6314401946
am dfcbf02b: am 6b1a0272: Merge "Create a separate copy of the fsck logs" into klp-dev
...
* commit 'dfcbf02bb0a6705e3714a59e42e052fbb0ce8799':
Create a separate copy of the fsck logs
2013-09-24 10:25:31 -07:00
Ken Sumrall
dbbafa5307
am 12d71925: am 777a00e3: Merge "New fstab flags to support more expressive SD card permissions" into klp-dev
...
* commit '12d71925862c9268a06c4a9bbf0904f22e1c5323':
New fstab flags to support more expressive SD card permissions
2013-09-24 10:25:21 -07:00
Ken Sumrall
dfcbf02bb0
am 6b1a0272: Merge "Create a separate copy of the fsck logs" into klp-dev
...
* commit '6b1a027239689a817aa5ca44a2bcbfe48ed21408':
Create a separate copy of the fsck logs
2013-09-23 18:59:39 -07:00
Ken Sumrall
12d7192586
am 777a00e3: Merge "New fstab flags to support more expressive SD card permissions" into klp-dev
...
* commit '777a00e3d193e45d928b1a26de85ae5a238271c4':
New fstab flags to support more expressive SD card permissions
2013-09-23 18:59:39 -07:00
Glenn Kasten
3707e7ff03
toolbox: Add nohup command
...
Change-Id: I2f7d9934b54d98886d7a6205ea122d9ce91066ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-09-23 15:37:55 -07:00
Ken Sumrall
6b1a027239
Merge "Create a separate copy of the fsck logs" into klp-dev
2013-09-23 20:06:57 +00:00
Ken Sumrall
777a00e3d1
Merge "New fstab flags to support more expressive SD card permissions" into klp-dev
2013-09-23 20:06:41 +00:00
Todd Poynor
4676550b56
init.rc: use oom_score_adj instead of oom_adj
...
Use kernel oom_score_adj interface to make init and children unkillable.
Stop using older, deprecated oom_adj interface.
Use OOM_SCORE_ADJ_MIN to make the processes unkillable (previously the processes
were set to a very low score, but not unkillable).
Change-Id: I680965009585c2a5a580859fb946f2d0caa95d9c
2013-09-23 18:32:36 +00:00
Todd Poynor
16b6099476
low memory killer: switch to kernel oom_score_adj interface
...
Use oom_score_adj for setting OOM score adjustment values instead
of the older, deprecated oom_adj interface.
Change-Id: I5ba7801d4b8971be092b31ae0fd8af8c3001d613
2013-09-23 18:32:02 +00:00
Jeff Sharkey
cae02657be
am 500f3ffa: am 0ee7d8c6: Fix Mac builds, for realz.
...
* commit '500f3ffad43d115faad38f4ed2c32a08b694f183':
Fix Mac builds, for realz.
2013-09-20 18:06:46 -07:00
Jeff Sharkey
500f3ffad4
am 0ee7d8c6: Fix Mac builds, for realz.
...
* commit '0ee7d8c68b57c02d02f707d6f71c731234d56eec':
Fix Mac builds, for realz.
2013-09-20 18:04:53 -07:00
Jeff Sharkey
0ee7d8c68b
Fix Mac builds, for realz.
...
Change-Id: I63e21b90e5b8a8f016dd04ceca4354793faa5e37
2013-09-20 18:00:15 -07:00
Ken Sumrall
4eaf905858
Create a separate copy of the fsck logs
...
The log_target parameter of android_fork_execvp_ext() is now a
bit field, and multiple targets can be set to log to multiple
places at the same time.
The new target LOG_FILE will log to a file specified by the new
parameter file_path.
Set LOG_FILE and log to a file in /dev (the only writable filesystem
avilable when e2fsck runs) when invoking e2fsck in fs_mgr.
Bug: 10021342
Change-Id: I63baf644cc8c3afccc8345df27a74203b44d0400
2013-09-20 17:44:33 -07:00
Ken Sumrall
887f289206
New fstab flags to support more expressive SD card permissions
...
Bug: 10330128
Change-Id: I41fb178b839487b604762fbc1ccba097d25c7aa0
2013-09-20 17:43:52 -07:00
Jeff Sharkey
7e82a37327
am 68955fc8: am 4481c325: Fix Mac builds.
...
* commit '68955fc82edc2b4a3b61712a9fb9c80a705ba4c0':
Fix Mac builds.
2013-09-20 17:41:52 -07:00
Jeff Sharkey
68955fc82e
am 4481c325: Fix Mac builds.
...
* commit '4481c325b16d4a42fd0ebf4c8a2bb5bcc09daf5e':
Fix Mac builds.
2013-09-20 17:39:27 -07:00
Jeff Sharkey
4481c325b1
Fix Mac builds.
...
Change-Id: I0eb029395a3afd2f93a7632d7d3d20d28c2ab189
2013-09-20 17:35:15 -07:00
Jeff Sharkey
aa4a3228f0
am 9729b415: am 44d6342c: Remove mkdir() side effect, add .nomedia, utils.
...
* commit '9729b41574ca5e5e87c86b203a2096cbdc72cfea':
Remove mkdir() side effect, add .nomedia, utils.
2013-09-20 15:59:37 -07:00
Jeff Sharkey
9729b41574
am 44d6342c: Remove mkdir() side effect, add .nomedia, utils.
...
* commit '44d6342caa0db1f613809e9ba1ea8d9af0183b74':
Remove mkdir() side effect, add .nomedia, utils.
2013-09-20 15:57:58 -07:00
Jeff Sharkey
44d6342caa
Remove mkdir() side effect, add .nomedia, utils.
...
Before this change, FUSE lookup() would have the side effect of
creating the directory on behalf of apps. This resulted in most
directories being created just by Settings trying to measure disk
space. Instead, we're switching to have vold do directory creation
when an app doesn't have enough permissions.
Create fs_mkdirs() utility to create all parent directories in a
path as needed. Allow traversal (+x) into /storage directories.
Fix FUSE derived permissions to be case insensitive. Mark well-known
directories as .nomedia when created.
Bug: 10577808, 10330221
Change-Id: I53114f2e63ffbe6de4ba6a72d94a232523231cad
2013-09-20 14:21:09 -07:00
Kenny Root
780e011f09
Merge "Remove UniquePtr.h copy"
2013-09-20 20:45:45 +00:00
Ying Wang
cf14eb59a5
Merge "Install the nonexistent-source symlink as a post-install step"
2013-09-20 18:14:03 +00:00
Kenny Root
d975f37294
Remove UniquePtr.h copy
...
This was copied from libcore/include quite a while ago, but the
canonical version has since moved out to a generic library called
libnativehelper. All users of this header should already have
libnativehelper on their include path, so switching to the canonical
version is as easy as removing the "utils/" part.
Change-Id: Iae8e59bf3eee573bfa78381866989934e5bbf19d
2013-09-20 10:47:08 -07:00
Ying Wang
c4d6ade839
Install the nonexistent-source symlink as a post-install step
...
Previously because /sbin/healthd does not exist on the build host, make
always tries to rebuild the symlink even in an already-up-to-date tree.
Change-Id: I41201282281476b14eaf4c7d9b2e09fe367c1422
2013-09-20 10:37:42 -07:00
Elliott Hughes
3aed2cf04f
Merge "Remove a homebrew mmap64."
2013-09-20 17:20:45 +00:00
Elliott Hughes
8202157062
Remove a homebrew mmap64.
...
This should have been fixed in bionic, and now has been.
Change-Id: Ib9b21771ed7fbb6b4082b52d0b590f2867f344d4
2013-09-20 10:18:21 -07:00
Elliott Hughes
60549075e8
am 4d5d633b: am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
...
* commit '4d5d633bf862dbb0a960019e80fadc40c93177f0':
libsparse: Use BIONIC implementation of mmap64()
2013-09-20 09:58:54 -07:00
Elliott Hughes
4d5d633bf8
am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
...
* commit '20eb7ac26435abb1b2514951eee07fee44773877':
libsparse: Use BIONIC implementation of mmap64()
2013-09-19 14:30:57 -07:00
Elliott Hughes
20eb7ac264
am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
...
* commit '3c8bdef029cbaa8d8fa18e4e55e51b60e938dd6e':
libsparse: Use BIONIC implementation of mmap64()
2013-09-19 14:25:01 -07:00
Elliott Hughes
3c8bdef029
Merge "libsparse: Use BIONIC implementation of mmap64()"
2013-09-19 21:22:47 +00:00
Geremy Condra
b5e14ead1e
Merge "Add append2simg."
2013-09-19 18:09:35 +00:00
Nick Kralevich
5660da25b9
am 1998e505: am 2e940286: am 0f507339: Merge "Do not change ownership of /sys/fs/selinux/load to system UID."
...
* commit '1998e505a98ad445bead87c2bb047053f1aea648':
Do not change ownership of /sys/fs/selinux/load to system UID.
2013-09-19 08:54:12 -07:00
Nick Kralevich
1998e505a9
am 2e940286: am 0f507339: Merge "Do not change ownership of /sys/fs/selinux/load to system UID."
...
* commit '2e9402863b40fe8bf2ddd8169c62f2419d968ff9':
Do not change ownership of /sys/fs/selinux/load to system UID.
2013-09-19 08:51:49 -07:00
Nick Kralevich
2e9402863b
am 0f507339: Merge "Do not change ownership of /sys/fs/selinux/load to system UID."
...
* commit '0f507339ec474a2f67227466efc9045630f1f1a4':
Do not change ownership of /sys/fs/selinux/load to system UID.
2013-09-19 08:50:21 -07:00
Nick Kralevich
0f507339ec
Merge "Do not change ownership of /sys/fs/selinux/load to system UID."
2013-09-19 15:47:53 +00:00
Stephen Smalley
cc13e8ab87
Do not change ownership of /sys/fs/selinux/load to system UID.
...
Policy reload is handled by setting the selinux.reload_policy property
and letting the init process perform the actual loading of policy into
the kernel. Thus, there should be no need for the system UID to directly
write to /sys/fs/selinux/load.
Change-Id: I240c5bb2deaee757a2e1e396e14dea9e5d9286f5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-09-19 11:26:26 -04:00
Elliott Hughes
af781c2692
am a2a93250: am c67bd8d7: am a208ea63: Merge "Fix fstab memory leak"
...
* commit 'a2a93250f625b776886d3c5d41599abdaddb2e50':
Fix fstab memory leak
2013-09-18 16:42:12 -07:00
Elliott Hughes
7fdd7913bd
am 9f25b565: am c4295d9b: am 810ff696: Merge "Cleanup fs_getline from fs_mgr"
...
* commit '9f25b565f716d865597dd24761137a93f08d4bb1':
Cleanup fs_getline from fs_mgr
2013-09-18 16:38:52 -07:00
Elliott Hughes
a2a93250f6
am c67bd8d7: am a208ea63: Merge "Fix fstab memory leak"
...
* commit 'c67bd8d7cd9b43a5a5ef249ea787ac9786359d22':
Fix fstab memory leak
2013-09-18 16:38:14 -07:00
Elliott Hughes
c67bd8d7cd
am a208ea63: Merge "Fix fstab memory leak"
...
* commit 'a208ea6301b3a7141f800d21407b0befa8ad0a56':
Fix fstab memory leak
2013-09-18 16:36:33 -07:00
Elliott Hughes
a208ea6301
Merge "Fix fstab memory leak"
2013-09-18 23:35:01 +00:00
Irina Tirdea
d431b8d7f1
Fix fstab memory leak
...
When reading the fstab config file fails, fstab memory is not freed.
When fstab structure is no longer needed, only half of it is freed.
Free fstab memory in all cases (error or when it is no longer needed).
Change-Id: Ib0758a5aaa69505285bf64143632986a2dbbdccb
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2013-09-18 16:34:02 -07:00
Elliott Hughes
9f25b565f7
am c4295d9b: am 810ff696: Merge "Cleanup fs_getline from fs_mgr"
...
* commit 'c4295d9b72812afbaebd7f2512c7a5bba9e7d5fa':
Cleanup fs_getline from fs_mgr
2013-09-18 16:33:55 -07:00
Elliott Hughes
c4295d9b72
am 810ff696: Merge "Cleanup fs_getline from fs_mgr"
...
* commit '810ff69609c6f6e0a562c8f05912d4d785fd8bd2':
Cleanup fs_getline from fs_mgr
2013-09-18 16:31:12 -07:00
Elliott Hughes
810ff69609
Merge "Cleanup fs_getline from fs_mgr"
2013-09-18 23:26:50 +00:00
Colin Cross
7a060eddce
am 54aad026: am 8dc82eea: am 36b39a97: Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"
...
* commit '54aad026616148164ff6ceda7508a4e5a04ec569':
init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
2013-09-18 16:09:13 -07:00
Colin Cross
54aad02661
am 8dc82eea: am 36b39a97: Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"
...
* commit '8dc82eea7ebda374830ee7fa1802222a94eefd88':
init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
2013-09-18 16:04:22 -07:00
Mathias Agopian
126cdc2c4b
am a512c1ca: am 7b445a8e: Merge "Fix rotation in camera2 API" into klp-dev
...
* commit 'a512c1ca6322b54b6a74be01be53d537f5a81da4':
Fix rotation in camera2 API
2013-09-18 15:39:19 -07:00
Mathias Agopian
a512c1ca63
am 7b445a8e: Merge "Fix rotation in camera2 API" into klp-dev
...
* commit '7b445a8e3a21055a5735585ca0890d14977032f0':
Fix rotation in camera2 API
2013-09-18 15:33:40 -07:00
Mathias Agopian
7b445a8e3a
Merge "Fix rotation in camera2 API" into klp-dev
2013-09-18 22:31:28 +00:00