summaryrefslogtreecommitdiffstats
path: root/rootdir
Commit message (Collapse)AuthorAgeFilesLines
* am 33357f54: am 6490257d: Make netd restart when system server hangs on it.Brad Fitzpatrick2010-09-211-0/+1
|\ | | | | | | | | | | | | Merge commit '33357f5477a24cb16bd3dd692fe5ca14755ab033' * commit '33357f5477a24cb16bd3dd692fe5ca14755ab033': Make netd restart when system server hangs on it.
| * am 6490257d: Make netd restart when system server hangs on it.Brad Fitzpatrick2010-09-211-0/+1
| |\ | | | | | | | | | | | | | | | | | | Merge commit '6490257d116c35d3da927ee7b91179dde64ef713' into gingerbread-plus-aosp * commit '6490257d116c35d3da927ee7b91179dde64ef713': Make netd restart when system server hangs on it.
| | * Make netd restart when system server hangs on it.Brad Fitzpatrick2010-09-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netd has been seen hanging (cause suspected but unconfirmed) which then brings down the system server which blocks forever on its main thread trying to connect to netd with its hung event loop. This then results in an infinite watchdog runtime restart loop because the situation never improves: netd is still borked. Instead, we should kill netd and give it another chance when the system server dies. Bug: 3018996 Bug: 3017876 Change-Id: Ibf9ecf0ffcb78e48c38e5167f21cbeefe0e2a47f
* | | resolved conflicts for merge of 3b5214a6 to masterBrian Swetland2010-09-191-2/+5
|\ \ \ | |/ / | | | | | | Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
| * | am 02863b95: add /vendor supportBrian Swetland2010-09-191-2/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '02863b957cfbfc302d3136ed78c0cba86accacd8' into gingerbread-plus-aosp * commit '02863b957cfbfc302d3136ed78c0cba86accacd8': add /vendor support
| | * add /vendor supportBrian Swetland2010-09-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - look in /vendor/firmware/... in addition to /system/etc/firmware/... for firmware loading - add /vendor/bin to path before /system/bin - add /vendor/lib to ldpath before /system/lib - configure appropriate permissions for /system/vendor/bin - symlink /vendor -> /system/vendor Change-Id: I0c06ca1e38a44f0c7024cee6cea8907aa93a4532
* | | am 26ce6e0e: manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-101-0/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1' * commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1': - Add drm and drmio service
| * | manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-101-0/+12
| |\ \ | | | | | | | | | | | | Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548
| | * \ Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM ↵Jean-Baptiste Queru2010-09-091-0/+12
| | |\ \ | | | | | | | | | | | | | | | related data"
| | | * | - Add drm and drmio serviceaimitakeshi2010-07-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add /data/drm directory for storing DRM related data Change-Id: Ifd8922a3de109dbf5cd3f9cabbf4e5689b16c1d7
* | | | | am 8df3a4a5: am 4012c0a4: Merge "remount / as read-only only on post-fs to ↵Brian Swetland2010-09-081-2/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow per-target config of /" into gingerbread Merge commit '8df3a4a554184afba71887995c5f0983ce81196f' * commit '8df3a4a554184afba71887995c5f0983ce81196f': remount / as read-only only on post-fs to allow per-target config of /
| * | | | am 4012c0a4: Merge "remount / as read-only only on post-fs to allow ↵Brian Swetland2010-09-081-2/+3
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per-target config of /" into gingerbread Merge commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4' into gingerbread-plus-aosp * commit '4012c0a46ab2ebdf6a1298bc4e85ed3368d1b8a4': remount / as read-only only on post-fs to allow per-target config of /
| | * | | remount / as read-only only on post-fs to allow per-target config of /Brian Swetland2010-09-081-2/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia89dd2021e0f960201b4cee573227f0addd48431
| * | | | am f2af88e8: Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-051-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f2af88e81af5efb2d585963507f798d5a8b93d67' into gingerbread-plus-aosp * commit 'f2af88e81af5efb2d585963507f798d5a8b93d67': Tracking merge of dalvik-dev to gingerbread
| | * | | Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git cherry-pick --no-commit b99a099c git cherry-pick --no-commit 9811671e023ceb82029040f7acf599013c773e6b git cherry-pick --no-commit d0645bf0cc76ef7be11cf77a8e1995233a1972e4 Change-Id: Ie70fecaeaba97a25f114cd2717e381b5107533b1
* | | | | Revert "system/core: add system/audio persmissions for /dev/audio*"Iliyan Malchev2010-07-301-1/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 7e8b01229dde701bee555ea1cf10986b773d5de0.
* | | | | system/core: add system/audio persmissions for /dev/audio*Iliyan Malchev2010-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If214241f8150f5ff6cce8b9a76c6c8e5bad9c35a Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aospJean-Baptiste Queru2010-07-291-0/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53' * commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53': Userland support for VM interconnection
| * | | | resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aospJean-Baptiste Queru2010-07-291-0/+10
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
| | * | | Merge "Userland support for VM interconnection"Jean-Baptiste Queru2010-07-291-0/+10
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Userland support for VM interconnectionDries Harnie2010-07-151-0/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I699608f3072b39c8da1a7cc313bd0b736e90f225
* | | | | am 544e1f86: merge from open-source masterThe Android Open Source Project2010-07-161-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '544e1f866edcbe55b3d8f65d50bc831dfb818657' * commit '544e1f866edcbe55b3d8f65d50bc831dfb818657': Fix sdcard mount issue.
| * | | | merge from open-source masterThe Android Open Source Project2010-07-161-1/+1
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | Change-Id: I03f6a73a782706a7c77041db4e626c40dffa647a
| | * | Fix sdcard mount issue.Ravi K Yenduri2010-07-151-1/+1
| | |/ | | | | | | | | | | | | | | | | | | Push vold.fstab on to the emulator, which is now denoted by TARGET_PRODUCT=full. Change-Id: I502af9b06903808fa2448c1013ddd8904f6000ca
* | | resolved conflicts for merge of 3cac9cb3 to masterKenny Root2010-07-151-0/+5
|\ \ \ | |/ / | | | | | | Change-Id: I86b5173ad49522eae082bf2a3d096dbfb5240129
| * | Add directories for OBB mountingKenny Root2010-07-151-0/+5
| | | | | | | | | | | | Change-Id: Ib73e9bca50fb168ab5d147cc260666a770092961
* | | updated BOOTCLASSPATH to track merge from dalvik-devBrian Carlstrom2010-06-301-1/+1
| | | | | | | | | | | | Change-Id: I10e6895ad3647dd789fe5fc7a7d37c4b71c61717
* | | ueventd.rc: Give the USB group read/write access to the MTP USB driver.Mike Lockwood2010-06-291-0/+1
| | | | | | | | | | | | | | | Change-Id: I305671848dbdf427333dc088f83f88cea1b33945 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Move UART device permissions to device specific init files.Jaikumar Ganesh2010-06-171-1/+0
| | | | | | | | | | | | Change-Id: I548386601d7546831bfeb044d15b1c9bf71f3e96
* | | init.rc: Move SD card support to device specific init.rc filesMike Lockwood2010-06-152-7/+9
| | | | | | | | | | | | | | | Change-Id: I5745e91df2b7c5722bd6e650931d3d2d7d0eadcb Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 0c6672c6: am 8b0ec20d: Update OOM adj levels.Dianne Hackborn2010-06-112-16/+38
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '0c6672c66a93f7a81d07ff3f59eee87ddb16db3c' * commit '0c6672c66a93f7a81d07ff3f59eee87ddb16db3c': Update OOM adj levels.
| * | Update OOM adj levels.Dianne Hackborn2010-06-102-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces some new buckets that will be used by the activity manager, and adjusts the default levels to match what we had been setting for Droid. It turns out Passion has been using the old levels, which makes no sense for how much memory it has. Also it is a problem with these definitions spreading to other projects for different devices, so I am going to update the defaults to be appropriate for our newer devices, and put here a file to tune them down for something like the sapphire. Change-Id: Ia4f33c4c3b94aeb3656f60b9222072a1d11e9e68
* | | am 25e7b8fc: am b1fb3bd1: am 230cb33f: Make /proc/kmsg and ↵Christopher Tate2010-06-021-0/+6
|\ \ \ | |/ / | | | | | | /proc/sysrq-trigger system-process-readable
| * | am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger ↵Christopher Tate2010-06-021-0/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | system-process-readable Merge commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163' into kraken * commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163': Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
| | * Make /proc/kmsg and /proc/sysrq-trigger system-process-readableChristopher Tate2010-06-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is so that the system process can capture kernel thread stacks when the watchdog detects a deadlock. Previously, /proc/kmsg was root/root and mode 0400, and /proc/sysrq-trigger was root/root and mode 0200. With this change, /proc/kmsg becomes root/system and 0440, and /proc/sysrq-trigger becomes root/system and 0220. Change-Id: Iac46bd10bd11d495024afeb5d693107ce5074791
| * | DO NOT MERGE resolved conflicts for merge of e95aad61 to krakenMike Lockwood2010-05-171-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | this change is already in master Change-Id: Ica43eae28b50d89d50217851aff7e62978abfa27 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Moving junit out of core.jar and into core-junit.jar.Jesse Wilson2010-05-111-1/+1
| | | | | | | | | | | | Change-Id: I603cba084c06ddbec21fc88bbaab7cde96952cb1
* | | init: Add support for /dev/bus/usb/ file system and add new unix group AID_USB.Mike Lockwood2010-05-061-0/+1
|/ / | | | | | | | | | | | | init now creates files in /dev/bus/usb/ for user access to USB devices. Files are chmod 660 with group AID_USB. Signed-off-by: Mike Lockwood <lockwood@android.com>
* | init: Add ueventd.rc parsing to ueventdColin Cross2010-04-213-0/+89
| | | | | | | | Change-Id: Iea53050d6c10e8cabf563e5d80e84eaf78873695
* | init: Move uevent handling to an external ueventd processColin Cross2010-04-211-0/+5
| | | | | | | | Change-Id: Iea6c56013062ade633a1754f7bcf8cf09b3dedc1
* | Move filesystem mounting into a new "fs" init levelColin Cross2010-04-131-2/+4
| | | | | | | | | | | | | | | | Devices with non-MTD storage need to override the filesystem mounting commands in init.rc. Moving them to a new "fs" init level allows a custom init.<device>.rc to handle the mounting. Change-Id: If0e655139b9734650fb798b6eb0a90e2241fc29b
* | Add a build dependency for ramdisk.img on system/core/rootdir/init.rcColin Cross2010-04-131-0/+1
|/ | | | Change-Id: Id9698a88720cc0c70e3d9c43c9bac9b74f4798b6
* Add NET_RAW to mediaserver so that it can open a raw HCI socket to configureNick Pelly2010-03-231-1/+1
| | | | | | BT chip. Change-Id: I22065b313c7af28b4791c74ea3d403a628738102
* cleanup init.rcJean-Baptiste Queru2010-03-121-7/+0
| | | | Change-Id: I7f7fefd61c6032c84fa63e597ea0e6bbe66d2e79
* init.rc: Add cpuacct to cgroup mount for cpu statisticMike Chan2010-03-011-0/+5
| | | | | | | Cpu accounting statistics expored in /acct Change-Id: I8a35816e94b69d9e67a3dd65aae16520864777d7 Signed-off-by: Mike Chan <mike@android.com>
* Revert "init.rc: Add cpuacct to cgroup mount for cpu statistics"San Mehat2010-02-271-3/+1
| | | | | | | This reverts commit a7d88224ff7283c210c25ce6d57239b4053b5f14. This cgroup subsys should be mounted on it's own mount-point, since it's addition to /dev/cpuctl causes the cpu subsys to EPERM
* init.rc: Add cpuacct to cgroup mount for cpu statisticsMike Chan2010-02-261-1/+3
| | | | | Change-Id: Ic1893e1bf7b2c45659419b0bc55d42f50d030c9f Signed-off-by: Mike Chan <mike@android.com>
* rootdir: init.rc: Enable I/O priorities for media server and voldSan Mehat2010-02-261-0/+2
| | | | | | | Sets the media-server to class 'real-time' pri 4, and vold to class 'best effort' pri 2 Signed-off-by: San Mehat <san@google.com>
* Update bluetooth data files path.Jaikumar Ganesh2010-02-251-0/+1
|
* rootdir: init.rc: Add 'ASEC_MOUNTPOINT' environment variable.San Mehat2010-02-241-0/+1
| | | | Signed-off-by: San Mehat <san@google.com>