summaryrefslogtreecommitdiffstats
path: root/rootdir
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix forceencrypt"Paul Lawrence2014-04-111-1/+1
|\
| * Fix forceencryptPaul Lawrence2014-04-101-1/+1
| | | | | | | | | | | | | | | | When changing vdc cryptfs enablecrypto inplace default in https://googleplex-android-review.git.corp.google.com/#/c/445001/ forgot to change init.rc Change-Id: I2a937d3c302ab8eab4829a36101145d6fe726ab1
* | am d85efaa0: am a73f7e92: am 822b1a02: Merge "Add a config for dual mode ↵Narayan Kamath2014-04-111-0/+12
|\ \ | |/ |/| | | | | | | | | zygote." * commit 'd85efaa068708b19db3cc647ba62c0a2feb7da23': Add a config for dual mode zygote.
| * am a73f7e92: am 822b1a02: Merge "Add a config for dual mode zygote."Narayan Kamath2014-04-111-0/+12
| |\ | | | | | | | | | | | | * commit 'a73f7e924abb8e7b1aa3f0d64d0177ce7d1c58e6': Add a config for dual mode zygote.
| | * Merge "Add a config for dual mode zygote."Narayan Kamath2014-04-111-0/+12
| | |\
| | | * Add a config for dual mode zygote.Narayan Kamath2014-04-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that init.zygote64.rc, which supports a "pure" 64 bit zygote is around only for testing. The life cycles of both zygotes are controlled by init, and the assumption here is that they will be available always. We start the system_server in 32 bit mode. Note that the distinction between "primary" and "secondary" simply defines the order in which ABI support is queried, there's no real requirement that the primary zygote supports the primary ABI of the device. bug: 13647418 Change-Id: Id0be001ea6f934c3c2022d89a63aae9fae66cc38
* | | | am 8b4ea5a4: am 39a5b812: am 2baf2886: Merge "Enable world-readable ↵dcashman2014-04-091-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | selinuxfs policy binary." * commit '8b4ea5a49dda2767af87604713053e1bc418e96f': Enable world-readable selinuxfs policy binary.
| * | | am 39a5b812: am 2baf2886: Merge "Enable world-readable selinuxfs policy binary."dcashman2014-04-091-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '39a5b812904ec13390d6261bafccf823729ae21d': Enable world-readable selinuxfs policy binary.
| | * | Enable world-readable selinuxfs policy binary.dcashman2014-04-071-0/+3
| | |/ | | | | | | | | | Change-Id: I1eefb457cea1164a8aa9eeb7683b3d99ee56ca99
* | | resolved conflicts for merge of 6a949b45 to masterNarayan Kamath2014-04-013-8/+17
|\ \ \ | |/ / | | | | | | Change-Id: Ie123b4fff76ef43e2b1c0583731e88997504320e
| * | am ffca173c: am 5da2dbbc: Merge "Move zygote init config to its own file."Narayan Kamath2014-04-013-8/+17
| |\ \ | | |/ | | | | | | | | | * commit 'ffca173c853a2e312610d87f40957f696ac8364a': Move zygote init config to its own file.
| | * Merge "Move zygote init config to its own file."Narayan Kamath2014-04-013-8/+17
| | |\
| | | * Move zygote init config to its own file.Narayan Kamath2014-03-313-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to choose different configs depending on whether or not the target is 64 capable, and what its preferred default is. bug: 13647418 Change-Id: Ie1ce4245a3add7544c87d27c635ee390f4062523
* | | | am ae66fbbe: am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on ↵Greg Hackmann2014-03-311-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | /dev/rtc0" * commit 'ae66fbbe0e747cb2485bac0fa47c9223268a2fc9': rootdir: reduce permissions on /dev/rtc0
| * | | am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"Greg Hackmann2014-03-311-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '697bdc604e8f266ebd6c94fc84eb5057b1a700e3': rootdir: reduce permissions on /dev/rtc0
| | * | Merge "rootdir: reduce permissions on /dev/rtc0"Greg Hackmann2014-03-311-1/+1
| | |\ \ | | | |/ | | |/|
| | | * rootdir: reduce permissions on /dev/rtc0Greg Hackmann2014-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove world-readable, reduce group permissions to readable by system daemons Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | Merge "Auto-encrypt drive at startup"Paul Lawrence2014-03-241-0/+12
|\ \ \ \
| * | | | Auto-encrypt drive at startupPaul Lawrence2014-03-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify fs_mgr to unmount encryptable drives after test mounting them and then trigger an auto-encrypt via the init script Needs matching vold changes from https://googleplex-android-review.googlesource.com/#/c/414200/ Feature is limited to list of serial numbers with this change Bug: 11985952 Change-Id: I84f85a258b6a7e9809467c9149249302e203c41b
* | | | | am b5f9e65a: am 0a0cc719: init.rc: Add lmkd service backMark Salyzyn2014-03-241-0/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'b5f9e65ad127261df2f7c9ed40d73b9024f492f6': init.rc: Add lmkd service back
| * | | | init.rc: Add lmkd service backMark Salyzyn2014-03-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - not impressed with conflict for merge f8f0531b Change-Id: I5b9a1a93ea0cf7eda4ced8dcfc9d0ad70f7aa6c8
* | | | | am 68b9d5f0: am bdef5499: resolved conflicts for merge of f8f0531b to ↵Mark Salyzyn2014-03-241-11/+7
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | klp-modular-dev-plus-aosp * commit '68b9d5f07a443b44d81e09f65a45fea8c8f4984b': logd: core requirement
| * | | resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aospMark Salyzyn2014-03-211-11/+7
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I87228aa0dbd0b909437c85812f2404ca8be39f38
| | * | logd: core requirementMark Salyzyn2014-03-211-6/+7
| | |/ | | | | | | | | | | | | | | | - has no dependency on /data, switch from main to core Change-Id: I4bfe3e67d4cbd31e943c609f5626e533857a27a9
| * | am 7283db6d: am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the ↵JP Abgrall2014-03-141-1/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | default to 60 * commit '7283db6d2694c8deae644a0d815cf292309a6176': init.rc: prep tcp_default_init_rwnd, set the default to 60
| | * \ am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60JP Abgrall2014-03-141-1/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'efbf36f2dad8f083de6f48dbb682461d7cfa9781': init.rc: prep tcp_default_init_rwnd, set the default to 60
| | | * | init.rc: prep tcp_default_init_rwnd, set the default to 60JP Abgrall2014-03-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kernel's default is between 4~20. Prepare for javaland to modify the value at runtime. It can be done via setprop sys.sysctl.tcp_def_init_rwnd <value> Bug: 12020135 Change-Id: Id34194b085206fd02e316401c0fbbb9eb52522d2 (cherry picked from commit 7c862c8b5e59cbe216a5bc092c01f1ecba8e9de4)
| | * | | Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.Stephen Smalley2014-02-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed in the various device-specific init*.rc files but seems generic. Move it to the main init.rc file. Drop the separate chown for /data/misc/dhcp as this is handled by mkdir built-in if the directory already exists. Add a restorecon_recursive /data/misc/wifi/sockets. Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | am 00eaae3a: am 556c9c24: am 858d0dd1: Merge "set ↵Mark Salyzyn2014-03-041-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | /proc/sys/net/unix/max_dgram_qlen to large value" * commit '00eaae3aaa6ea3ca2c9c00e0559fa6937ce33e37': set /proc/sys/net/unix/max_dgram_qlen to large value
| * | | | am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"Mark Salyzyn2014-03-041-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '858d0dd1e529575181abd8de607e46f7b273cc9d': set /proc/sys/net/unix/max_dgram_qlen to large value
| | * | | set /proc/sys/net/unix/max_dgram_qlen to large valueMark Salyzyn2014-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - init: set /proc/sys/net/unix/max_dgram_qlen to 300 - libsysutils: Add listen backlog argument to startListener - logd: set listen backlog to 300 Change-Id: Id6d37d6c937ba2d221e76258d89c9516619caeec
* | | | | am e6fb169f: am e570fd3a: am 9453bce4: Merge "Apply restorecon_recursive to ↵Nick Kralevich2014-02-261-8/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | all of /data." * commit 'e6fb169fd69bfa6775737f37d45041c5b229321c': Apply restorecon_recursive to all of /data.
| * | | | am 9453bce4: Merge "Apply restorecon_recursive to all of /data."Nick Kralevich2014-02-261-8/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '9453bce4cff952aab5c90f5b30c6c12d3e1521e5': Apply restorecon_recursive to all of /data.
| | * | | Merge "Apply restorecon_recursive to all of /data."Nick Kralevich2014-02-261-8/+3
| | |\ \ \
| | | * | | Apply restorecon_recursive to all of /data.Stephen Smalley2014-02-061-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the following prior changes: I77bf2a0c4c34b1feef6fdf4d6c3bd92dbf32f4a1 I698b1b2c3f00f31fbb2015edf23d33b51aa5bba1 I8dd915d9bb80067339621b905ea2b4ea0fa8d71e it should now be safe (will correctly label all files) and reasonably performant (will skip processing unless file_contexts has changed since the last call) to call restorecon_recursive /data from init.rc. The call is placed after the setprop selinux.policy_reload 1 so that we use any policy update under /data/security if present. Change-Id: Ib8d9751a47c8e0238cf499fcec61898937945d9d Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
| * | | | | resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aospNick Kralevich2014-02-261-0/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: I9ee9908a915258937b343de90dce5774d914f03a
| | * | | | logd: initial checkin.Mark Salyzyn2014-02-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create a new userspace log daemon for handling logging messages. Original-Change-Id: I75267df16359684490121e6c31cca48614d79856 Signed-off-by: Nick Kralevich <nnk@google.com> * Merge conflicts * rename new syslog daemon to logd to prevent confusion with bionic syslog * replace racy getGroups call with KISS call to client->getGid() * Timestamps are filed at logging source * insert entries into list in timestamp order * Added LogTimeEntry tail filtration handling * Added region locking around LogWriter list * separate threads for each writer * /dev/socket/logd* permissions Signed-off-by: Mark Salyzyn <salyzyn@google.com> (cherry picked from commit 3e76e0a49760c4970b7cda6153e51026af98e4f3) Author: Nick Kralevich <nnk@google.com> Change-Id: Ice88b1412d8f9daa7f9119b2b5aaf684a5e28098
* | | | | | init.rc: prep tcp_default_init_rwnd, set the default to 60JP Abgrall2014-02-211-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kernel's default is between 4~20. Prepare for javaland to modify the value at runtime. It can be done via setprop sys.sysctl.tcp_def_init_rwnd <value> Bug: 12020135 Change-Id: Id34194b085206fd02e316401c0fbbb9eb52522d2
* | | | | | Merge changes I929dddc7,Ice88b141,I243b1338Mark Salyzyn2014-02-201-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: logd: prune more aggressively when over the top logd: initial checkin. logcat: test: add clear and blocking check
| * | | | | | logd: initial checkin.Nick Kralevich2014-02-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create a new userspace log daemon for handling logging messages. Original-Change-Id: I75267df16359684490121e6c31cca48614d79856 Signed-off-by: Nick Kralevich <nnk@google.com> * Merge conflicts * rename new syslog daemon to logd to prevent confusion with bionic syslog * replace racy getGroups call with KISS call to client->getGid() * Timestamps are filed at logging source * insert entries into list in timestamp order * Added LogTimeEntry tail filtration handling * Added region locking around LogWriter list * separate threads for each writer * /dev/socket/logd* permissions Signed-off-by: Mark Salyzyn <salyzyn@google.com> Change-Id: Ice88b1412d8f9daa7f9119b2b5aaf684a5e28098
* | | | | | | am ee9de136: am bb2da79f: am 27fd413d: Merge "Start debuggerd64 for 64-bit ↵Colin Cross2014-02-161-0/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processes" * commit 'ee9de136c52555e8775611ad32fc8ee47c75e3d1': Start debuggerd64 for 64-bit processes
| * | | | | | am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"Colin Cross2014-02-161-0/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '27fd413d6d02a53c453cf926717b67e9a8d1eb32': Start debuggerd64 for 64-bit processes
| | * | | | | Start debuggerd64 for 64-bit processesDan Willemsen2014-02-161-0/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | Change-Id: I2fc33d9eb2726b043d2f13bfab0c605dbb6083c7
* | | | | | Merge "Mount default encrypted devices at boot"Paul Lawrence2014-02-141-1/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Mount default encrypted devices at bootPaul Lawrence2014-02-071-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If userdata is default encrypted, we should mount it at boot to avoid bringing the framework up and then down unnecessarily. Needs matching vold changes from https://googleplex-android-review.googlesource.com/#/c/412649/ Bug: 8769627 Change-Id: I4b8276befd832cd788e15c36edfbf8f0e18d7e6b
* | | | | | lowmemorykiller: make perms 0220Nick Kralevich2014-02-131-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set * /sys/module/lowmemorykiller/parameters/adj * /sys/module/lowmemorykiller/parameters/minfree to 0220. This better indicates that these files are only intended to be written to, never read. Change-Id: I9ef054f032b3955e04128fc1a472a17c7b1fa792
* | | | | Merge "set permissions of recovery install script"Doug Zongker2014-02-041-1/+1
|\ \ \ \ \
| * | | | | set permissions of recovery install scriptDoug Zongker2014-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script that writes the recovery partition after a successful update of system needs to be made executable. This change also moves it from /system/etc to /system/bin. Bug: 12893978 Change-Id: I686e2392a2392515a6859a7381b735de1007b7ea
* | | | | | am fbca9d94: am 7e3d72d9: am ba023b06: Merge "Move creation of ↵Nick Kralevich2014-02-041-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | /data/misc/wifi and /data/misc/dhcp to main init.rc file." * commit 'fbca9d9449231839b805ef4b11e4b2d968e601e3': Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
| * | | | am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to ↵Nick Kralevich2014-02-041-1/+5
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | | | | | | | | main init.rc file." * commit 'ba023b063d25b73923f2df536b6258967f756ff6': Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.