summaryrefslogtreecommitdiffstats
path: root/rootdir
Commit message (Collapse)AuthorAgeFilesLines
* am 08a15076: am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference ↵Narayan Kamath2014-05-151-1/+1
|\ | | | | | | | | | | | | to app_process32." * commit '08a1507603d63f07cfce65ead701330e1fe89894': Change app_process reference to app_process32.
| * am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference to app_process32."Narayan Kamath2014-05-151-1/+1
| |\ | | | | | | | | | | | | * commit 'a5f7aca82e63942e9449804fd11eb11aec710419': Change app_process reference to app_process32.
| | * am 75a8eeb1: Merge "Change app_process reference to app_process32."Narayan Kamath2014-05-151-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '75a8eeb1ecf9f748b1d53e5ff3a5e138a0cdbebd': Change app_process reference to app_process32.
| | | * Merge "Change app_process reference to app_process32."Narayan Kamath2014-05-151-1/+1
| | | |\
| | | | * Change app_process reference to app_process32.Narayan Kamath2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required due to change 5a7ee9ad63 which makes app_process a symlink to the primary zygote. Change-Id: I940f6302db97f74dd57112e310014e989dc586e5
| * | | | am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the ↵Sreeram Ramachandran2014-05-141-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | fwmark of sockets." * commit '9743f09724162186fb280627c3c125a55534a219': Introduce fwmarkd: a service to set the fwmark of sockets.
| | * | | am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."Sreeram Ramachandran2014-05-141-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '09eaad793a8cec9196255d740ecb89a1426c0bf7': Introduce fwmarkd: a service to set the fwmark of sockets.
| | | * | Introduce fwmarkd: a service to set the fwmark of sockets.Sreeram Ramachandran2014-05-141-0/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d5121e212c1f53b1cb6458ee83be892d94fdfef3) Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
* | | | Introduce fwmarkd: a service to set the fwmark of sockets.Sreeram Ramachandran2014-05-141-0/+1
| | | | | | | | | | | | | | | | Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
* | | | am ca61b484: am b8cfcf3d: am 32e4479d: Merge "Set kernel proc files for ↵Sreeram Ramachandran2014-05-131-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | fwmark reflection and table numbers for RAs." * commit 'ca61b484b6eb1bf92b05bc5386668ec51999e55a': Set kernel proc files for fwmark reflection and table numbers for RAs.
| * | | am b8cfcf3d: am 32e4479d: Merge "Set kernel proc files for fwmark reflection ↵Sreeram Ramachandran2014-05-131-0/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | and table numbers for RAs." * commit 'b8cfcf3d9beb6ae09512941a182c326723b3ef41': Set kernel proc files for fwmark reflection and table numbers for RAs.
| | * | am 32e4479d: Merge "Set kernel proc files for fwmark reflection and table ↵Sreeram Ramachandran2014-05-131-0/+7
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | numbers for RAs." * commit '32e4479d5535887d03625b43b7e3574b458dfc8d': Set kernel proc files for fwmark reflection and table numbers for RAs.
| | | * Set kernel proc files for fwmark reflection and table numbers for RAs.Sreeram Ramachandran2014-05-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 2c2807ac1041751583e0c3b6892ca56eae423fa2) Change-Id: I5f0d759cb9b8590555af7f5503f00d3e455ece54
* | | | am 57569b3d: am 1abf4918: am c7580819: Merge "ueventd: Ueventd changes the ↵Ruchi Kandoi2014-05-011-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | permission of sysfs files for max/min cpufreq" * commit '57569b3d3cea0b2096a15e8d25b41df9f836fd08': ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
| * | | am 1abf4918: am c7580819: Merge "ueventd: Ueventd changes the permission of ↵Ruchi Kandoi2014-05-011-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | sysfs files for max/min cpufreq" * commit '1abf49180acece56ff7573d53b65c6a28d2a4cb2': ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
| | * | am c7580819: Merge "ueventd: Ueventd changes the permission of sysfs files ↵Ruchi Kandoi2014-05-011-0/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | for max/min cpufreq" * commit 'c7580819934b85e93f58001f9b59b12712bb61b8': ueventd: Ueventd changes the permission of sysfs files for max/min cpufreq
| | | * ueventd: Ueventd changes the permission of sysfs files for max/minRuchi Kandoi2014-05-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cpufreq The owner and permissions for the sysfs file /sys/devices/system/cpu*/cpufreq/scaling_max/min_freq is changed. This would allow the PowerHAL to change the max/min cpufreq even after the associated CPU's are hotplugged out and back in. Change-Id: Ibe0b4aaf3db555ed48e89a7fcd0c5fd3a18cf233 Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
| | * | Merge commit '4102af05a86aae36d2560fd8b3f740a52399342c' into HEADBill Yi2014-04-291-1/+15
| | |\ \ | | | |/ | | |/|
| | | * am f8f0531b: Merge "logd: core requirement"Mark Salyzyn2014-03-211-6/+7
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'f8f0531bb69a90e87f1bafa875e665e3935610b1': logd: core requirement
| | | * \ 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
| | | * \ \ am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"Mark Salyzyn2014-03-111-0/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '858d0dd1e529575181abd8de607e46f7b273cc9d': set /proc/sys/net/unix/max_dgram_qlen to large value
| | | * \ \ \ am 9453bce4: Merge "Apply restorecon_recursive to all of /data."Nick Kralevich2014-03-111-8/+3
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9453bce4cff952aab5c90f5b30c6c12d3e1521e5': Apply restorecon_recursive to all of /data.
| | | * \ \ \ \ am e9c8fb90: Merge "logd: initial checkin."Mark Salyzyn2014-03-111-0/+6
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9c8fb900a460699201208870ce9997a734261cc': logd: initial checkin.
| | | * \ \ \ \ \ am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"Colin Cross2014-03-071-0/+3
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '27fd413d6d02a53c453cf926717b67e9a8d1eb32': Start debuggerd64 for 64-bit processes
| | | * \ \ \ \ \ \ am ba023b06: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to ↵Nick Kralevich2014-03-071-1/+5
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main init.rc file." * commit 'ba023b063d25b73923f2df536b6258967f756ff6': Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
* | | | | | | | | | | Make Volantis devices encryptablePaul Lawrence2014-04-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volantis SurfaceFlinger holds open a file on data partition. SurfaceFlinger is not running when we trigger_default_encryption but if we start it before starting defaultcrypto it locks open data, so we can't unmount it. It will start anyway when main starts, so not starting it here is safe - it will just cause a 1-2 second delay in the graphics appearing. Change-Id: Idd546a578e62a24f999367b1407b37ad0f00f3a2
* | | | | | | | | | | am 46e6b4f7: am b0397d55: am 9bb44b41: Merge "rootdir: init.rc: update max ↵JP Abgrall2014-04-181-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TCP window sizes for mobile networks" * commit '46e6b4f7fd5f6488d0ba06a26d67888136b3ee3e': rootdir: init.rc: update max TCP window sizes for mobile networks
| * | | | | | | | | | am b0397d55: am 9bb44b41: Merge "rootdir: init.rc: update max TCP window ↵JP Abgrall2014-04-181-7/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sizes for mobile networks" * commit 'b0397d55a2ff4b3c6664c9545be18ba88c07dea4': rootdir: init.rc: update max TCP window sizes for mobile networks
| | * | | | | | | | | rootdir: init.rc: update max TCP window sizes for mobile networksNarayan Reddy2014-04-181-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GRPS: RTT=600ms, max tput=80kbps (class 12 GMSK 4+1) EDGE: RTT=300ms, max tput=236kbps (class 12 8PSK) UMTS: RTT=200ms, max tput=384kbps (R99) HSDPA: RTT=75ms, max tput=14Mbps (cat 10) HSUPA: RTT=50ms, max tput=14Mbps HSPA: RTT=50ms, max tput=14Mbps HSPA+: RTT=50ms, max tput=42Mbps (cat 20) LTE: RTT=20ms, max tput=100Mbps (class 3) bug 67569 Change-Id: I9d62359bbd11dc68e3649a7ea2295d0d4e25e3f2 Signed-off-by: Narayan Reddy <narayanr@nvidia.com> Signed-off-by: Steve Lin <stlin@nvidia.com>
* | | | | | | | | | | 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