Commit Graph

410 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
Chia-chi Yeh bbfe1368d9 Remove dead services from init.rc. 2010-02-22 09:32:16 +08:00
San Mehat 6f957c3f25 generic_rootdir: vold_fstab: Change '/sdcard' -> '/mnt/sdcard'
Signed-off-by: San Mehat <san@google.com>
2010-02-19 18:38:28 -08:00
San Mehat 6ea3cc6089 rootdir: init.rc: Create secure staging directories, and a compat symlink
Signed-off-by: San Mehat <san@google.com>
2010-02-19 18:38:28 -08:00
Vasu Nori 55a1f0827b dont create sqlite_stmt_journals dir.
this shoudl not be required any longer. in fact, some test-writers are
abusing this dir.
2010-01-26 23:12:37 -08:00
San Mehat 92175e04a5 rootdir: init.rc: Fix typo in chown of /dev/cpuctl
Signed-off-by: San Mehat <san@google.com>
2010-01-17 12:21:42 -08:00
San Mehat 192277c015 rootdir: init.rc: Add netd to startup services list
Signed-off-by: San Mehat <san@google.com>
2010-01-15 07:48:35 -08:00
San Mehat 1851d80959 init.rc: Adjust perms on /asec
Signed-off-by: San Mehat <san@google.com>
2010-01-06 17:41:34 -08:00
Oscar Montemayor d0aa32c3d9 Apps on SD project. Small change to support apps on SD file system key storage. 2010-01-06 16:24:48 -08:00
San Mehat 900570e2a8 init.rc: Create a small tmpfs on /asec so we can create mountpoints
Signed-off-by: San Mehat <san@google.com>
2010-01-06 11:02:42 -08:00
San Mehat 37c71dd9a7 init.rc: Add new /asec mount point
Signed-off-by: San Mehat <san@google.com>
2010-01-04 09:41:52 -08:00
San Mehat 5184fc5c79 rootdir: Switch to vold.fstab
Signed-off-by: San Mehat <san@google.com>
2009-12-24 07:20:36 -08:00
Oscar Montemayor 37c586e6b1 Encrypted File Systems Project.
Temporarily creating emulated encrypted directories manually.
Will remove those lines once a true encrypted FS is mounted, and proper
framework chanfes have been made. This is required for the feature to
work with the other changes.
2009-12-03 13:11:30 -08:00
Dan Egnor d2633cb709 am 7359c16a: Don\'t copy /proc/last_kmsg to /data/dontpanic/last_kmsg -- it gets generated on every boot, so this is a bunch of writing for no particularly good reason.
Merge commit '7359c16a852c23740ef2874aa6b66f629d1473b7' into eclair-mr2-plus-aosp

* commit '7359c16a852c23740ef2874aa6b66f629d1473b7':
  Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
2009-11-24 14:51:07 -08:00
Dan Egnor 7359c16a85 Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
it gets generated on every boot, so this is a bunch of writing
for no particularly good reason.
2009-11-23 19:25:44 -08:00
Doug Zongker 6114b2dfb4 am eb67fac4: change /cache/recovery group to cache
Merge commit 'eb67fac4723892ac8ae3fae87c05e776c49029c5' into eclair-mr2-plus-aosp

* commit 'eb67fac4723892ac8ae3fae87c05e776c49029c5':
  change /cache/recovery group to cache
2009-11-19 20:21:09 -08:00
Doug Zongker eb67fac472 change /cache/recovery group to cache
To unbundle system update, we need users other than system to be able
to write the /cache/recovery directory.
2009-11-19 16:52:02 -08:00
Jean-Michel Trivi 879f398a44 am 5a8cf57e: am 5e7db233: Make the RIL daemon part of the audio group so it can load region-specific acoustic parameters.
Merge commit '5a8cf57eb7aa70f1647b28315a2419c4a6d36828' into eclair-mr2-plus-aosp

* commit '5a8cf57eb7aa70f1647b28315a2419c4a6d36828':
  Make the RIL daemon part of the audio group so it can load region-specific
2009-11-02 16:25:30 -08:00
Jean-Michel Trivi 5e7db23300 Make the RIL daemon part of the audio group so it can load region-specific
acoustic parameters.
2009-11-02 15:22:18 -08:00
San Mehat dd7105a7a1 am aaad7ab4: am fd110c7f: Merge change I831d8e1e into eclair
Merge commit 'aaad7ab4ae9e6913481fe4348b040e5d3e2aaec1' into eclair-mr2-plus-aosp

* commit 'aaad7ab4ae9e6913481fe4348b040e5d3e2aaec1':
  rootdir: init.rc: Adjust background dirty writeout policy
2009-10-13 13:05:56 -07:00
San Mehat 831d8e1e3a rootdir: init.rc: Adjust background dirty writeout policy
Signed-off-by: San Mehat <san@google.com>
2009-10-13 12:27:18 -07:00
Dan Bornstein 46c9658f4f am 1dec5032: Force the mediaserver process to restart whenever the zygote or system server do.
Merge commit '1dec5032cfadc1a3d7687ce5b6cd322e4151ce9d' into eclair-plus-aosp

* commit '1dec5032cfadc1a3d7687ce5b6cd322e4151ce9d':
  Force the mediaserver process to restart whenever the zygote or system
2009-10-09 15:43:18 -07:00
Dan Bornstein 1dec5032cf Force the mediaserver process to restart whenever the zygote or system
server do.

Change-Id: I16ce4ae656473055e7e244ccd4af7055959e3c1c
2009-10-09 14:52:15 -07:00
Rebecca Schultz Zavin 19257e7c00 am ea935c1d: Merge change I7b04795c into eclair
Merge commit 'ea935c1d9771fa2cc00583720586c209463f2791' into eclair-plus-aosp

* commit 'ea935c1d9771fa2cc00583720586c209463f2791':
  Make vmallocinfo readable by group log so we can put it in bugreports
2009-10-08 16:20:34 -07:00
Rebecca Schultz Zavin 14d898e014 Make vmallocinfo readable by group log so we can put it in bugreports
Change-Id: I7b04795c029c51108132e7a9eaf46b97de06de6f
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2009-10-08 16:15:58 -07:00
Brian Swetland 64e5c1d5d2 am aa7d9710: init.rc: don\'t mount debugfs
Merge commit 'aa7d97106abf8c390e1aed71f7c175fb77fead38' into eclair-plus-aosp

* commit 'aa7d97106abf8c390e1aed71f7c175fb77fead38':
  init.rc: don't mount debugfs
2009-10-07 12:36:45 -07:00
Brian Swetland aa7d97106a init.rc: don't mount debugfs
We'll do this in the product-specific init files.
2009-10-07 12:28:44 -07:00
San Mehat b0cc66698f am 529520e8: Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"
Merge commit '529520e8240e6865aca77ae9abf78dacbaa72e2c' into eclair-plus-aosp

* commit '529520e8240e6865aca77ae9abf78dacbaa72e2c':
  Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"
2009-10-07 11:55:14 -07:00
San Mehat 529520e824 Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"
This reverts commit 35ad5f41c3.
2009-10-06 11:22:55 -07:00
David 'Digit' Turner 6b4e9ebc4c am a0c98ef0: Ensure -user builds can run the dex preopt pass in the emulator.
Merge commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007' into eclair-plus-aosp

* commit 'a0c98ef01a4c5a859fdde35fed7977b1eb919007':
  Ensure -user builds can run the dex preopt pass in the emulator.
2009-09-23 11:43:23 -07:00
David 'Digit' Turner a0c98ef01a Ensure -user builds can run the dex preopt pass in the emulator.
This is done by ensuring that /init.goldfish.rc and /system/etc/init.goldfish.sh
are part of the system image, even if it lacks other emulator related bits.
2009-09-23 11:22:31 -07:00
Chia-chi Yeh eed96af19d am 9b4f1ff2: init.rc: specify keystore directory and fix permissions.
Merge commit '9b4f1ff210c449920890581b191da3568c10fbd1' into eclair-plus-aosp

* commit '9b4f1ff210c449920890581b191da3568c10fbd1':
  init.rc: specify keystore directory and fix permissions.
2009-09-20 20:56:33 -07:00
Chia-chi Yeh 9b4f1ff210 init.rc: specify keystore directory and fix permissions. 2009-09-21 11:47:02 +08:00
Jaikumar Ganesh dea31b4133 am 1320687b: Remove logwrapper for Bluetoothd.
Merge commit '1320687bdb6df2de1c27fb03c827b69384d26f87' into eclair-plus-aosp

* commit '1320687bdb6df2de1c27fb03c827b69384d26f87':
  Remove logwrapper for Bluetoothd.
2009-09-20 10:38:32 -07:00
Jaikumar Ganesh 1320687bdb Remove logwrapper for Bluetoothd.
Change-Id: I6d16bc0dbdf9f3aff2080f8c7968ff3cb592811e
2009-09-20 10:31:45 -07:00
Brian Swetland 6569442437 am bb6f68c6: init.rc: mount debugfs for debugging
Merge commit 'bb6f68c63d79bf58bd53f463de1bd23d49e5b8a4' into eclair-plus-aosp

* commit 'bb6f68c63d79bf58bd53f463de1bd23d49e5b8a4':
  init.rc: mount debugfs for debugging
2009-09-18 15:44:37 -07:00
Brian Swetland bb6f68c63d init.rc: mount debugfs for debugging
- put it at /sys/kernel/debug so Arve will be happy
- symlink /d to /sys/kernel/debug so Brian will be happy.
2009-09-18 15:31:23 -07:00
repo sync da17dee033 resolved conflicts for merge of 35ad5f41 to eclair-plus-aosp 2009-09-16 15:00:36 -07:00
San Mehat b183eb1891 am 7baff71b: rootdir: init.rc: tweak cfs scheduler - disable child_runs_first
Merge commit '7baff71b0d8fe320df9143b2fa59db0af1b7aa96' into eclair-plus-aosp

* commit '7baff71b0d8fe320df9143b2fa59db0af1b7aa96':
  rootdir: init.rc: tweak cfs scheduler - disable child_runs_first
2009-09-16 14:37:39 -07:00
San Mehat 35ad5f41c3 rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support
Signed-off-by: San Mehat <san@google.com>
2009-09-16 14:13:14 -07:00
San Mehat 7baff71b0d rootdir: init.rc: tweak cfs scheduler - disable child_runs_first
Signed-off-by: San Mehat <san@google.com>
2009-09-16 13:32:23 -07:00
Mike Lockwood 6088a9ad87 am 25f1a5aa: init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root
Merge commit '25f1a5aaffd1ef6e87d53d4fd3c14ea1b6c5b940' into eclair-plus-aosp

* commit '25f1a5aaffd1ef6e87d53d4fd3c14ea1b6c5b940':
  init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root
2009-09-11 14:50:22 -07:00
Mike Lockwood 25f1a5aaff init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root
Change-Id: Iff83310f9411c39e1833b3d710b029b12f702993
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-11 17:13:28 -04:00
David 'Digit' Turner 3ebc52eb71 am 2f21659d: Merge change 24213 into eclair
Merge commit '2f21659d4565afd65da1be07c28317a3cb4287a1' into eclair-plus-aosp

* commit '2f21659d4565afd65da1be07c28317a3cb4287a1':
  Fix a bug that prevented the "generic" product builds from working in the emulator.
2009-09-09 18:05:38 -07:00
Android (Google) Code Review 2f21659d45 Merge change 24213 into eclair
* changes:
  Fix a bug that prevented the "generic" product builds from working in the emulator.
2009-09-09 21:02:10 -04:00
Mike Lockwood aae43f9e75 am 9332482e: init.rc: Make /data/dontpanic files readable only by the system process.
Merge commit '9332482ed2945174d94615f0720f88702cb92667' into eclair-plus-aosp

* commit '9332482ed2945174d94615f0720f88702cb92667':
  init.rc: Make /data/dontpanic files readable only by the system process.
2009-09-08 20:21:04 -07:00
Mike Lockwood 9332482ed2 init.rc: Make /data/dontpanic files readable only by the system process.
Change-Id: If87470b7bcbb1c0774d10296ac82605db3dd9bf0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-08 22:55:59 -04:00
David 'Digit' Turner ca8177d814 Fix a bug that prevented the "generic" product builds from working in the emulator.
This also ensures that emulator-specific files /init.goldfish.rc and
/system/etc/init.goldfish.sh are never part of -user builds, which
correspond to production devices.
2009-09-08 16:03:49 -07:00
San Mehat f914c821e1 am 82a6014d: rootdir: init.rc: Allow all processes access to /data/dontpanic
Merge commit '82a6014d90c94a2032e014901917e1d503475d5e' into eclair-plus-aosp

* commit '82a6014d90c94a2032e014901917e1d503475d5e':
  rootdir: init.rc: Allow all processes access to /data/dontpanic
2009-09-05 15:11:50 -07:00
San Mehat 82a6014d90 rootdir: init.rc: Allow all processes access to /data/dontpanic
***STOPSHIP***

Signed-off-by: San Mehat <san@google.com>
2009-09-05 15:01:52 -07:00
Mike Lockwood 410776e1cf am e991decf: Merge changes 23694,23695,23696 into eclair
Merge commit 'e991decf340e24203ed63f87d9313598cd09a46c' into eclair-plus-aosp

* commit 'e991decf340e24203ed63f87d9313598cd09a46c':
  init.rc: Add dumpstate service
  init: Add support for enforcing setprop by caller's group.
  adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell.
2009-09-03 14:21:47 -07:00
Mike Lockwood abe3a9c305 init.rc: Add dumpstate service
Change-Id: Iaf7094dd4693c47566c1acf860b750b762af840c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-03 00:36:25 -04:00
San Mehat 991e9189a4 am 020f35f2: rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.
Merge commit '020f35f274594f55eec956fdcfec90ad3d7a5c65' into eclair-plus-aosp

* commit '020f35f274594f55eec956fdcfec90ad3d7a5c65':
  rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.
2009-09-01 15:47:12 -07:00
San Mehat 020f35f274 rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.
This is a temporary measure until bugreports are taken as root.

*****STOPSHIP*****
Signed-off-by: San Mehat <san@google.com>
2009-09-01 15:43:25 -07:00
San Mehat c6a81332c9 am f26d6cea: rootdir: init.rc: Clean up dump collection
Merge commit 'f26d6cea4cda7b959491f26ab5f67b8ca99ea7fa' into eclair-plus-aosp

* commit 'f26d6cea4cda7b959491f26ab5f67b8ca99ea7fa':
  rootdir: init.rc: Clean up dump collection
2009-09-01 15:42:24 -07:00
San Mehat f26d6cea4c rootdir: init.rc: Clean up dump collection
Signed-off-by: San Mehat <san@google.com>
2009-09-01 13:13:10 -07:00
Jean-Baptiste Queru 8c92ba1921 merge from open-source master 2009-09-01 08:28:21 -07:00
San Mehat 2dfe490f43 system: vold: Ensure a default vold.conf exists for generic target
Signed-off-by: San Mehat <san@google.com>
2009-08-31 08:05:49 -07:00
Simon Braunschmidt 15681df356 BUGFIX - ro.kernel.android.{qemud | ril} and ro.android.noril
This fixes both a typo and the fact that sh seems not to have
test or [.
(see also sh/builtins.def: ##testcmd commented out)

The handling of these properties was broken, having the effect
that the Modem in ... internal/telephony/test/Simulated*.java
was never run, even if it would have been the users/developers
intention.

See also issue #1380
http://code.google.com/p/android/issues/detail?id=1380

Signed-off-by: Simon.Braunschmidt@gmail.com>
2009-08-27 08:01:14 -07:00
San Mehat 21541872c3 rootdir: init.rc: Copy kernel crash dumps to /data and free kernel resources
Signed-off-by: San Mehat <san@google.com>
2009-08-26 16:39:59 -07:00
Hiroshi Takekawa 7acf3386cc init.rc: Fixes typo: sytem -> system. 2009-08-26 19:51:04 +09:00
San Mehat 6bc6794f97 am ee40fc4e: rootdir: init.rc: Bump up background cpu shares to 5.0%
Merge commit 'ee40fc4e64e1656a16603778bee895ea389ec7d5'

* commit 'ee40fc4e64e1656a16603778bee895ea389ec7d5':
  rootdir: init.rc: Bump up background cpu shares to 5.0%
2009-08-06 15:02:33 -07:00
San Mehat ee40fc4e64 rootdir: init.rc: Bump up background cpu shares to 5.0%
Signed-off-by: San Mehat <san@google.com>
2009-08-06 14:13:35 -07:00
Jaikumar Ganesh 630f5f049b Add Bluetooth PBAP service. 2009-07-26 23:18:29 -07:00
Doug Zongker d39e972831 am d52f54c4: install recovery image using patch mechanism
Merge commit 'd52f54c4552d2f35b3c2c2ac60350ac83760222f'

* commit 'd52f54c4552d2f35b3c2c2ac60350ac83760222f':
  install recovery image using patch mechanism
2009-07-23 23:59:16 -07:00
Doug Zongker d52f54c455 install recovery image using patch mechanism
With the corresponding change in build/tools, the recovery image is
installed via a shell script that is emitted by the OTA builder.
2009-07-23 15:18:34 -07:00
Nick Pelly b44aeb7b6a Add OPUSH to register obex server. 2009-07-14 21:29:15 -07:00
Android (Google) Code Review eced01b171 am 160d4b05: Merge change 6738 into donut
Merge commit '160d4b0509e4566930ef9af4f2b9d63b33aebee5'

* commit '160d4b0509e4566930ef9af4f2b9d63b33aebee5':
  rootdir: Remove ip-up-vpn script, which is replaced by an executable.
2009-07-12 21:56:42 -07:00
Android (Google) Code Review 160d4b0509 Merge change 6738 into donut
* changes:
  rootdir: Remove ip-up-vpn script, which is replaced by an executable.
2009-07-12 21:22:36 -07:00
Chia-chi Yeh 1219448dc7 rootdir: Remove ip-up-vpn script, which is replaced by an executable. 2009-07-10 15:51:01 +08:00
Mike Lockwood 3338e55114 am 48d116ed: init.rc: Fix commands for allowing the system_server to access wpa_supplicant.conf
Merge commit '48d116edf9c785ed284626cbe0bbf5c958cf5e67'

* commit '48d116edf9c785ed284626cbe0bbf5c958cf5e67':
  init.rc: Fix commands for allowing the system_server to access wpa_supplicant.conf
2009-07-08 18:07:46 -07:00
Mike Lockwood 48d116edf9 init.rc: Fix commands for allowing the system_server to access wpa_supplicant.conf
The touch command does not exist, and the chown commands are unnecessary because
the system_server is in the WIFI group.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-08 20:55:36 -04:00
Amith Yamasani 3bbaec5a7b am eefef323: Set the permissions of wifi supplicant file so that system can access it.
Merge commit 'eefef3234ae1e3b0f2db71415f134c7ec49899fa'

* commit 'eefef3234ae1e3b0f2db71415f134c7ec49899fa':
  Set the permissions of wifi supplicant file so that system can access it.
2009-07-06 11:03:02 -07:00
Android (Google) Code Review 91217ca5cb am 5c49135b: Merge change 5852 into donut
Merge commit '5c49135b032235f82560d5e55b0e4c547506516b'

* commit '5c49135b032235f82560d5e55b0e4c547506516b':
  rootdir: Modify init.rc to run mtpd/racoon as a non-root user.
2009-07-02 14:24:58 -07:00
Amith Yamasani eefef3234a Set the permissions of wifi supplicant file so that system can access it.
Create the required directories and set the correct owner and permissions.
2009-07-02 12:08:13 -07:00
Chia-chi Yeh 51afbf5838 rootdir: Modify init.rc to run mtpd/racoon as a non-root user.
Note that this change requires a new prebuilt kernel for AID_NET_ADMIN.
2009-07-01 07:06:47 +08:00
San Mehat acc9a25ef7 am 4322f2d7: init: Enable sched_yield() compatability mode on boot.
Merge commit '4322f2d74f625a0e8275ea1d2fa0d78bfc5c3029'

* commit '4322f2d74f625a0e8275ea1d2fa0d78bfc5c3029':
  init: Enable sched_yield() compatability mode on boot.
2009-06-30 14:49:00 -07:00
Chia-chi Yeh fff1092b71 am 3860b6e6: rootdir: Obsolete ppp/peers/common and racoon/racoon.conf.
Merge commit '3860b6e67c72afceddf316c0a3282f53496de8af'

* commit '3860b6e67c72afceddf316c0a3282f53496de8af':
  rootdir: Obsolete ppp/peers/common and racoon/racoon.conf.
2009-06-29 20:19:46 -07:00
Android (Google) Code Review 24f3a2fe8f am bbdab64d: Merge change 4592 into donut
Merge commit 'bbdab64ddd5341bb7f7c923bc86f43bdbc7d89dc'

* commit 'bbdab64ddd5341bb7f7c923bc86f43bdbc7d89dc':
  rootdir: Remove gprs/pppd related scripts.
2009-06-29 18:12:06 -07:00
San Mehat 4322f2d74f init: Enable sched_yield() compatability mode on boot.
In CFS, the (somewhat undefined) behavior of sched_yield() changed.

    See: http://kerneltrap.org/Linux/CFS_and_sched_yield

    This change enables 'compat' mode for sched_yield()

Signed-off-by: San Mehat <san@google.com>
2009-06-29 08:47:43 -07:00
Chia-chi Yeh 3860b6e67c rootdir: Obsolete ppp/peers/common and racoon/racoon.conf. 2009-06-27 07:38:50 +08:00
Android (Google) Code Review bbdab64ddd Merge change 4592 into donut
* changes:
  rootdir: Remove gprs/pppd related scripts.
2009-06-26 15:19:39 -07:00
Android (Google) Code Review a65044fad8 am a1140ad4: Merge change 5455 into donut
Merge commit 'a1140ad45dc90e6f51944a12d0a690e757c9bd0b'

* commit 'a1140ad45dc90e6f51944a12d0a690e757c9bd0b':
  Add new PPP IPCP script for VPN.
2009-06-25 20:50:44 -07:00
Hung-ying Tyan 34ccf656e2 Add new PPP IPCP script for VPN. 2009-06-26 08:11:59 +08:00
Chia-chi Yeh abd54c1b78 rootdir: Remove gprs/pppd related scripts.
vpn related scripts will be updated in the next change.
2009-06-18 17:18:51 +08:00
San Mehat f1d63f3751 am bfa2f8e9: init: Bump up the max cpu bandwidth shares ratio for background.
Merge commit 'bfa2f8e9b506a4b710ebcefa7c1e324609b8ca34'

* commit 'bfa2f8e9b506a4b710ebcefa7c1e324609b8ca34':
  init: Bump up the max cpu bandwidth shares ratio for background.
2009-06-17 15:37:55 -07:00
San Mehat bfa2f8e9b5 init: Bump up the max cpu bandwidth shares ratio for background.
New ratio is 1024/16 (1.5625% for background when cpu is under load)

Signed-off-by: San Mehat <san@google.com>
2009-06-16 18:33:37 -07:00
Mike Chan 6df2e9fc2e am d709b582: remove 3G timeout values from init.rc, this should be device specific
Merge commit 'd709b582604e7f9d53b97f9ae13c5e12b2466c56'

* commit 'd709b582604e7f9d53b97f9ae13c5e12b2466c56':
  remove 3G timeout values from init.rc, this should be device specific
2009-06-14 21:12:35 -07:00
Mike Chan d709b58260 remove 3G timeout values from init.rc, this should be device specific
Signed-off-by: Mike Chan <mike@android.com>
2009-06-12 13:55:15 -07:00
Chung-yih Wang 9862028d79 am 0bd9a9f5: Add the ipcp scripts for pppd and racoon configuration for ipsec-tools.
Merge commit '0bd9a9f5bcaefda8d7d37c9383b004b516009b85'

* commit '0bd9a9f5bcaefda8d7d37c9383b004b516009b85':
  Add the ipcp scripts for pppd and racoon configuration for ipsec-tools.
2009-06-12 11:43:50 -07:00
Chung-yih Wang 0bd9a9f5bc Add the ipcp scripts for pppd and racoon configuration for ipsec-tools.
1. add ip-up/ip-down script
2. add /etc/ppp/peers/common
3. add /etc/racoon/racoon.conf
2009-06-12 22:35:42 +08:00
San Mehat 6f5fb6fda1 am 3d6f16e5: init.rc: Set default cpu shares for background scheduler group to < 1%
Merge commit '3d6f16e5edc9834b13a0bcc8a33c98e25518d919'

* commit '3d6f16e5edc9834b13a0bcc8a33c98e25518d919':
  init.rc: Set default cpu shares for background scheduler group to < 1%
2009-06-10 11:15:30 -07:00
San Mehat 3d6f16e5ed init.rc: Set default cpu shares for background scheduler group to < 1%
Signed-off-by: San Mehat <san@google.com>
2009-06-10 10:49:57 -07:00
Jaikumar Ganesh 1d36696821 Bluez4 changes
Rename hcid to bluetoothd and change permissions.
2009-06-09 17:21:38 -07:00
Dmitry Shmidt 720f08f3ff Add /config mounting point
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2009-06-09 14:38:56 -07:00
Chung-yih Wang 1f75d709c1 Add VPN and Keystore services and data directories.
-- changed the default mode to 0770 for keystore with the new user 'keystore'.
-- add the keystore service providing the basic key lookup/install/remove, but
  only keystore user can access the key content.
2009-06-09 10:49:39 +08:00
Christopher Tate 17df71e0b2 Add an OOM adjustment category for apps undergoing backup
In this initial commit, apps undergoing backup are treated equivalently
to apps hosting services:  more important than anything other than the
foreground app.
2009-06-05 18:20:08 -07:00
David 'Digit' Turner 653164b6a0 Modify init.goldfish.sh to launch the 'qemu-props' program when the emulator boots up.
Its purpose is to receive a list of system property (name,value) pairs and set them on launch.
2009-05-26 13:16:59 +02:00
Mathias Agopian 8b2cf9f04b add bootanimation service to init.rc 2009-05-21 18:45:53 -07:00
San Mehat 269946c09f init.rc: Add Nexus to services (disabled for now)
Signed-off-by: San Mehat <san@google.com>
2009-05-06 15:20:22 -07:00
San Mehat 4933098e22 cgroups: Initialize cgroups at startup.
Signed-off-by: San Mehat <san@google.com>
2009-04-21 14:34:19 -07:00
Nick Pelly 01161168aa Automated import from //branches/donutburger/...@142809,142809 2009-03-25 18:00:56 -07:00
The Android Open Source Project f614d64d4b auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:49 -07:00
The Android Open Source Project e037fd7e19 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:37 -07:00
The Android Open Source Project 2015549667 auto import from //branches/cupcake/...@137873 2009-03-11 12:12:01 -07:00
The Android Open Source Project e4749f30e5 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:15 -07:00
The Android Open Source Project dd7bc3319d auto import from //depot/cupcake/@135843 2009-03-03 19:32:55 -08:00
The Android Open Source Project e54eebbf1a auto import from //depot/cupcake/@135843 2009-03-03 18:29:04 -08:00
The Android Open Source Project 13f797da7f auto import from //branches/cupcake/...@130745 2009-02-10 15:44:07 -08:00
The Android Open Source Project 35237d1358 Code drop from //branches/cupcake/...@124589 2008-12-17 18:08:08 -08:00
The Android Open Source Project 4f6e8d7a00 Initial Contribution 2008-10-21 07:00:00 -07:00