Commit Graph

160 Commits

Author SHA1 Message Date
Brad Fitzpatrick d7482b2f4c am 33357f54: am 6490257d: Make netd restart when system server hangs on it.
Merge commit '33357f5477a24cb16bd3dd692fe5ca14755ab033'

* commit '33357f5477a24cb16bd3dd692fe5ca14755ab033':
  Make netd restart when system server hangs on it.
2010-09-21 17:44:45 -07:00
Brad Fitzpatrick 33357f5477 am 6490257d: Make netd restart when system server hangs on it.
Merge commit '6490257d116c35d3da927ee7b91179dde64ef713' into gingerbread-plus-aosp

* commit '6490257d116c35d3da927ee7b91179dde64ef713':
  Make netd restart when system server hangs on it.
2010-09-21 16:27:25 -07:00
Brad Fitzpatrick 6490257d11 Make netd restart when system server hangs on it.
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
2010-09-21 15:49:06 -07:00
Brian Swetland d06df51bcd resolved conflicts for merge of 3b5214a6 to master
Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
2010-09-19 04:35:19 -07:00
Brian Swetland 3b5214a67f am 02863b95: add /vendor support
Merge commit '02863b957cfbfc302d3136ed78c0cba86accacd8' into gingerbread-plus-aosp

* commit '02863b957cfbfc302d3136ed78c0cba86accacd8':
  add /vendor support
2010-09-19 03:49:43 -07:00
Brian Swetland 02863b957c add /vendor support
- 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
2010-09-19 03:36:39 -07:00
Jean-Baptiste Queru a5220b24d1 am 26ce6e0e: manual merge from readonly-korg-master
Merge commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1'

* commit '26ce6e0e1608a9e804fa9721cc6326cdbaa5b7c1':
  - Add drm and drmio service
2010-09-10 11:30:33 -07:00
Jean-Baptiste Queru 26ce6e0e16 manual merge from readonly-korg-master
Change-Id: Id17f69d22fbbc84578be5aadd5e8e906ff0eb548
2010-09-10 10:43:36 -07:00
Jean-Baptiste Queru bb130ba799 Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM related data" 2010-09-09 14:13:01 -07:00
Brian Swetland e6d8a5f1df am 8df3a4a5: am 4012c0a4: Merge "remount / as read-only only on post-fs to 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 /
2010-09-08 15:51:10 -07:00
Brian Swetland 8df3a4a554 am 4012c0a4: Merge "remount / as read-only only on post-fs to allow 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 /
2010-09-08 15:08:16 -07:00
Brian Swetland 56de7a1263 remount / as read-only only on post-fs to allow per-target config of /
Change-Id: Ia89dd2021e0f960201b4cee573227f0addd48431
2010-09-08 15:06:45 -07:00
Brian Carlstrom 3c659a8d64 am f2af88e8: Tracking merge of dalvik-dev to gingerbread
Merge commit 'f2af88e81af5efb2d585963507f798d5a8b93d67' into gingerbread-plus-aosp

* commit 'f2af88e81af5efb2d585963507f798d5a8b93d67':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:39:18 -07:00
Brian Carlstrom f2af88e81a Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit b99a099c
git cherry-pick --no-commit 9811671e02
git cherry-pick --no-commit d0645bf0cc

Change-Id: Ie70fecaeaba97a25f114cd2717e381b5107533b1
2010-08-04 15:45:52 -07:00
Iliyan Malchev e306a9044a Revert "system/core: add system/audio persmissions for /dev/audio*"
This reverts commit 7e8b01229d.
2010-07-30 19:58:31 -07:00
Iliyan Malchev 7e8b01229d system/core: add system/audio persmissions for /dev/audio*
Change-Id: If214241f8150f5ff6cce8b9a76c6c8e5bad9c35a
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-07-29 17:11:51 -07:00
Jean-Baptiste Queru 30be93c6e2 am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53'

* commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53':
  Userland support for VM interconnection
2010-07-29 15:55:34 -07:00
Jean-Baptiste Queru 60c8f863ca resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
2010-07-29 15:53:16 -07:00
Jean-Baptiste Queru 0fcbdb4147 Merge "Userland support for VM interconnection" 2010-07-29 15:04:57 -07:00
aimitakeshi e572d596b3 - Add drm and drmio service
- Add /data/drm directory for storing DRM related data

Change-Id: Ifd8922a3de109dbf5cd3f9cabbf4e5689b16c1d7
2010-07-27 08:38:35 +09:00
The Android Open Source Project 5687abe6ef am 544e1f86: merge from open-source master
Merge commit '544e1f866edcbe55b3d8f65d50bc831dfb818657'

* commit '544e1f866edcbe55b3d8f65d50bc831dfb818657':
  Fix sdcard mount issue.
2010-07-16 13:24:29 -07:00
The Android Open Source Project 544e1f866e merge from open-source master
Change-Id: I03f6a73a782706a7c77041db4e626c40dffa647a
2010-07-16 13:22:23 -07:00
Kenny Root f848a429dd resolved conflicts for merge of 3cac9cb3 to master
Change-Id: I86b5173ad49522eae082bf2a3d096dbfb5240129
2010-07-15 14:01:01 -07:00
Kenny Root c7858a3dde Add directories for OBB mounting
Change-Id: Ib73e9bca50fb168ab5d147cc260666a770092961
2010-07-15 12:39:53 -07:00
Ravi K Yenduri 2ee12e7a34 Fix sdcard mount issue.
Push vold.fstab on to the emulator, which is now denoted by
TARGET_PRODUCT=full.

Change-Id: I502af9b06903808fa2448c1013ddd8904f6000ca
2010-07-15 09:25:54 -05:00
Dries Harnie 2a743730c7 Userland support for VM interconnection
Change-Id: I699608f3072b39c8da1a7cc313bd0b736e90f225
2010-07-15 13:19:37 +02:00
Brian Carlstrom d0645bf0cc updated BOOTCLASSPATH to track merge from dalvik-dev
Change-Id: I10e6895ad3647dd789fe5fc7a7d37c4b71c61717
2010-06-30 00:56:35 -07:00
Mike Lockwood 69286093d0 ueventd.rc: Give the USB group read/write access to the MTP USB driver.
Change-Id: I305671848dbdf427333dc088f83f88cea1b33945
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-29 14:52:20 -04:00
Jaikumar Ganesh 5f81c272c1 Move UART device permissions to device specific init files.
Change-Id: I548386601d7546831bfeb044d15b1c9bf71f3e96
2010-06-17 13:42:24 -07:00
Mike Lockwood a2dffa9db6 init.rc: Move SD card support to device specific init.rc files
Change-Id: I5745e91df2b7c5722bd6e650931d3d2d7d0eadcb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-15 22:48:30 -07:00
Dianne Hackborn c594780674 am 0c6672c6: am 8b0ec20d: Update OOM adj levels.
Merge commit '0c6672c66a93f7a81d07ff3f59eee87ddb16db3c'

* commit '0c6672c66a93f7a81d07ff3f59eee87ddb16db3c':
  Update OOM adj levels.
2010-06-11 11:00:40 -07:00
Dianne Hackborn 8b0ec20d6f Update OOM adj levels.
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
2010-06-10 17:52:37 -07:00
Christopher Tate f96e700b33 am 25e7b8fc: am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable 2010-06-02 22:23:25 -07:00
Christopher Tate 25e7b8fcc3 am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
Merge commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163' into kraken

* commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163':
  Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
2010-06-02 11:20:39 -07:00
Christopher Tate 230cb33fd1 Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
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
2010-06-01 17:48:30 -07:00
Mike Lockwood c0d8fb5842 DO NOT MERGE resolved conflicts for merge of e95aad61 to kraken
this change is already in master

Change-Id: Ica43eae28b50d89d50217851aff7e62978abfa27
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-17 14:24:36 -04:00
Jesse Wilson 9811671e02 Moving junit out of core.jar and into core-junit.jar.
Change-Id: I603cba084c06ddbec21fc88bbaab7cde96952cb1
2010-05-11 20:21:18 -07:00
Mike Lockwood b717dc85d8 init: Add support for /dev/bus/usb/ file system and add new unix group AID_USB.
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>
2010-05-06 13:40:51 -04:00
Colin Cross 44b65d047c init: Add ueventd.rc parsing to ueventd
Change-Id: Iea53050d6c10e8cabf563e5d80e84eaf78873695
2010-04-21 20:59:42 -07:00
Colin Cross f83d0b9af5 init: Move uevent handling to an external ueventd process
Change-Id: Iea6c56013062ade633a1754f7bcf8cf09b3dedc1
2010-04-21 20:59:38 -07:00
Colin Cross 31712beaf7 Move filesystem mounting into a new "fs" init level
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
2010-04-13 20:06:03 -07:00
Colin Cross dc61c9cda5 Add a build dependency for ramdisk.img on system/core/rootdir/init.rc
Change-Id: Id9698a88720cc0c70e3d9c43c9bac9b74f4798b6
2010-04-13 20:06:03 -07:00
Nick Pelly c741f22d85 Add NET_RAW to mediaserver so that it can open a raw HCI socket to configure
BT chip.

Change-Id: I22065b313c7af28b4791c74ea3d403a628738102
2010-03-23 20:39:05 -07:00
Jean-Baptiste Queru bbf3ea46fb cleanup init.rc
Change-Id: I7f7fefd61c6032c84fa63e597ea0e6bbe66d2e79
2010-03-12 16:36:41 -08:00
Mike Chan 89f235c5e0 init.rc: Add cpuacct to cgroup mount for cpu statistic
Cpu accounting statistics expored in /acct

Change-Id: I8a35816e94b69d9e67a3dd65aae16520864777d7
Signed-off-by: Mike Chan <mike@android.com>
2010-03-01 20:29:58 -08:00
San Mehat b91bf4ba86 Revert "init.rc: Add cpuacct to cgroup mount for cpu statistics"
This reverts commit a7d88224ff.

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
2010-02-27 10:06:09 -08:00
Mike Chan a7d88224ff init.rc: Add cpuacct to cgroup mount for cpu statistics
Change-Id: Ic1893e1bf7b2c45659419b0bc55d42f50d030c9f
Signed-off-by: Mike Chan <mike@android.com>
2010-02-26 11:25:36 -08:00
San Mehat f0cb74e3b0 rootdir: init.rc: Enable I/O priorities for media server and vold
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>
2010-02-26 10:05:24 -08:00
Jaikumar Ganesh eafdd86f4d Update bluetooth data files path. 2010-02-25 19:46:29 -08:00
San Mehat a9db22f122 rootdir: init.rc: Add 'ASEC_MOUNTPOINT' environment variable.
Signed-off-by: San Mehat <san@google.com>
2010-02-24 10:17:37 -08:00