Commit Graph

28140 Commits

Author SHA1 Message Date
David 'Digit' Turner 1199c43a44 am 6b4e9ebc: am a0c98ef0: Ensure -user builds can run the dex preopt pass in the emulator.
Merge commit '6b4e9ebc4cab1dab3b8769a27868addd202a29b5'

* commit '6b4e9ebc4cab1dab3b8769a27868addd202a29b5':
  Ensure -user builds can run the dex preopt pass in the emulator.
2009-09-25 08:52:49 -07:00
Ethan.Du 9e421c9410 am 3afe20b0: vold: Add support for /dev/block/mmcblk1
Merge commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce' into eclair-plus-aosp

* commit '3afe20b0beb7e274eee195de436211a3e8d1b0ce':
  vold: Add support for /dev/block/mmcblk1
2009-09-24 10:52:13 -07:00
Ethan.Du 3afe20b0be vold: Add support for /dev/block/mmcblk1
Signed-off-by: Ethan.Du <a7233c@motorola.com>
Signed-off-by: San Mehat <san@google.com>
2009-09-24 10:16:15 -07:00
Jean-Baptiste Queru 814215f44e am ff7d5835: Merge change 26093 into eclair
Merge commit 'ff7d5835d91b979836b66dc42fac69adf2c6c3a3' into eclair-plus-aosp

* commit 'ff7d5835d91b979836b66dc42fac69adf2c6c3a3':
  Add NOTICE file and license tag for adb
2009-09-24 09:50:03 -07:00
Android (Google) Code Review ff7d5835d9 Merge change 26093 into eclair
* changes:
  Add NOTICE file and license tag for adb
2009-09-24 12:45:49 -04: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
Robert CH Chou 8a0ba1b1e4 am 9aaa76a7: am 79aedbee: Merge change 26423 into eclair
Merge commit '9aaa76a7af547a34251c4eb480a4aa3d7485b56d'

* commit '9aaa76a7af547a34251c4eb480a4aa3d7485b56d':
  Add support for Acer devices
2009-09-23 11:33:04 -07:00
Dan Egnor 05c2df2b41 am 5864a8c9: am b92174db: Add event parameter for the restore set (device id) data is being restored from
Merge commit '5864a8c9021240e061ce2e4e76c95e2b3d3daa9e'

* commit '5864a8c9021240e061ce2e4e76c95e2b3d3daa9e':
  Add event parameter for the restore set (device id) data is being restored from
2009-09-23 11:31:45 -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
Robert CH Chou 9aaa76a7af am 79aedbee: Merge change 26423 into eclair
Merge commit '79aedbee8ff9d9c37ae063fc970632faa3f90227' into eclair-plus-aosp

* commit '79aedbee8ff9d9c37ae063fc970632faa3f90227':
  Add support for Acer devices
2009-09-22 13:36:50 -07:00
Android (Google) Code Review 79aedbee8f Merge change 26423 into eclair
* changes:
  Add support for Acer devices
2009-09-22 16:29:09 -04:00
Robert CH Chou 7953b89e8d Add support for Acer devices
Change-Id: I7045249f86e2b628c31c888e95eb5ba6f6c47251
2009-09-22 13:03:14 -07:00
Dan Egnor 5864a8c902 am b92174db: Add event parameter for the restore set (device id) data is being restored from
Merge commit 'b92174db6d93521656893a2c5108950417532c1d' into eclair-plus-aosp

* commit 'b92174db6d93521656893a2c5108950417532c1d':
  Add event parameter for the restore set (device id) data is being restored from
2009-09-22 12:47:36 -07:00
Dan Egnor b92174db6d Add event parameter for the restore set (device id) data is being restored from 2009-09-22 10:42:52 -07:00
Christopher Tate 6985357875 am 02f31506: am 061b6de7: Add event log tag for server-prompted reset of backup data
Merge commit '02f315068e02aa82bc7846b58c4ae959c4b97a24'

* commit '02f315068e02aa82bc7846b58c4ae959c4b97a24':
  Add event log tag for server-prompted reset of backup data
2009-09-21 13:26:21 -07:00
Christopher Tate 02f315068e am 061b6de7: Add event log tag for server-prompted reset of backup data
Merge commit '061b6de7b350a03a969a82b273a4d585ffbd086c' into eclair-plus-aosp

* commit '061b6de7b350a03a969a82b273a4d585ffbd086c':
  Add event log tag for server-prompted reset of backup data
2009-09-21 13:21:16 -07:00
Christopher Tate 061b6de7b3 Add event log tag for server-prompted reset of backup data 2009-09-21 13:12:09 -07:00
Doug Zongker a07e147790 am b4da08cd: am 88003b0d: Merge change 26051 into eclair
Merge commit 'b4da08cd7447c98a9f9b5f39e07c3d5a7b5e7ffc'

* commit 'b4da08cd7447c98a9f9b5f39e07c3d5a7b5e7ffc':
  add account field to the sync log event
2009-09-21 09:31:20 -07:00
Doug Zongker b4da08cd74 am 88003b0d: Merge change 26051 into eclair
Merge commit '88003b0de2d1d9c24ef4542473e6eabca79d0bd7' into eclair-plus-aosp

* commit '88003b0de2d1d9c24ef4542473e6eabca79d0bd7':
  add account field to the sync log event
2009-09-21 09:25:44 -07:00
Android (Google) Code Review 88003b0de2 Merge change 26051 into eclair
* changes:
  add account field to the sync log event
2009-09-21 12:21:08 -04:00
Mike Lockwood 505f05e490 am 8afb03fc: am 6ae92563: adb: Add USB Vendor IDs for LG and Huawei
Merge commit '8afb03fc12c131de8e8e0dae932dcead0a107949'

* commit '8afb03fc12c131de8e8e0dae932dcead0a107949':
  adb: Add USB Vendor IDs for LG and Huawei
2009-09-21 05:29:54 -07:00
Mike Lockwood 8afb03fc12 am 6ae92563: adb: Add USB Vendor IDs for LG and Huawei
Merge commit '6ae9256322053354c7d2badccc0ce5c24b37c243' into eclair-plus-aosp

* commit '6ae9256322053354c7d2badccc0ce5c24b37c243':
  adb: Add USB Vendor IDs for LG and Huawei
2009-09-21 05:24:54 -07:00
Mike Lockwood 6ae9256322 adb: Add USB Vendor IDs for LG and Huawei
Change-Id: Ib47e3e39609bac9cf34f2b9334aa95184b3db71d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-21 08:09:59 -04:00
Chia-chi Yeh 3a5ae8753c am eed96af1: am 9b4f1ff2: init.rc: specify keystore directory and fix permissions.
Merge commit 'eed96af19d81803d982c8cb91e2a120c8035e980'

* commit 'eed96af19d81803d982c8cb91e2a120c8035e980':
  init.rc: specify keystore directory and fix permissions.
2009-09-20 23:06:44 -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
Jean-Baptiste Queru 2fcdaf9907 Add NOTICE file and license tag for adb
BUG=1716164
2009-09-20 19:02:02 -07:00
Doug Zongker 6f9d1c2174 add account field to the sync log event 2009-09-20 15:48:22 -07:00
Jaikumar Ganesh f3f76b6a60 am dea31b41: am 1320687b: Remove logwrapper for Bluetoothd.
Merge commit 'dea31b41331b87bf825e796c6a1bec6a39bfbb04'

* commit 'dea31b41331b87bf825e796c6a1bec6a39bfbb04':
  Remove logwrapper for Bluetoothd.
2009-09-20 10:43:49 -07: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
Mike Lockwood e8ce002703 am a85a5ba9: am b6b40079: adb: Clean up argument passing for create_service_thread()
Merge commit 'a85a5ba9fdfb7f31f8580a71c4f95313d9236884'

* commit 'a85a5ba9fdfb7f31f8580a71c4f95313d9236884':
  adb: Clean up argument passing for create_service_thread()
2009-09-20 07:39:42 -07:00
Mike Lockwood a85a5ba9fd am b6b40079: adb: Clean up argument passing for create_service_thread()
Merge commit 'b6b40079e6d5b32026cc2abfcb71adfd49e8d954' into eclair-plus-aosp

* commit 'b6b40079e6d5b32026cc2abfcb71adfd49e8d954':
  adb: Clean up argument passing for create_service_thread()
2009-09-20 07:34:43 -07:00
Mike Lockwood b6b40079e6 adb: Clean up argument passing for create_service_thread()
Change-Id: Id68b312e76215e8e217b42ca0301713dbddfee9e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-19 17:49:57 -04:00
Jack Palevich 63fa2fa325 am 08c586a5: am 119dcd84: Merge change 25859 into eclair
Merge commit '08c586a507b6b165be164821beea925e730aca99'

* commit '08c586a507b6b165be164821beea925e730aca99':
  Improve error-handling when an expected token is missing.
2009-09-18 18:16:42 -07:00
Brian Swetland 0af358c2bd am 65694424: am bb6f68c6: init.rc: mount debugfs for debugging
Merge commit '656944243786dc4e7569f4ae22b5943aeba9e919'

* commit '656944243786dc4e7569f4ae22b5943aeba9e919':
  init.rc: mount debugfs for debugging
2009-09-18 18:15:39 -07:00
Jack Palevich 583013192b am fc9c83e9: am 1c60e46e: Produce error rather than assert when encountering a nested function.
Merge commit 'fc9c83e9cc48f1dcd32b672d12bc3c9819eaca26'

* commit 'fc9c83e9cc48f1dcd32b672d12bc3c9819eaca26':
  Produce error rather than assert when encountering a nested function.
2009-09-18 18:14:53 -07:00
Jack Palevich 08c586a507 am 119dcd84: Merge change 25859 into eclair
Merge commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7' into eclair-plus-aosp

* commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7':
  Improve error-handling when an expected token is missing.
2009-09-18 16:30:19 -07:00
Android (Google) Code Review 119dcd8400 Merge change 25859 into eclair
* changes:
  Improve error-handling when an expected token is missing.
2009-09-18 19:26:43 -04:00
Jack Palevich b13d4e857a Improve error-handling when an expected token is missing.
We had been arbitrarily swallowing the next token, even if it wasn't
the one we were expecting. Now we only swallow it if it _is_ the one
we were expecting.
2009-09-18 16:26:05 -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
Jack Palevich fc9c83e9cc am 1c60e46e: Produce error rather than assert when encountering a nested function.
Merge commit '1c60e46e0e5a20426e235eaede8f1cf7395f4cc0' into eclair-plus-aosp

* commit '1c60e46e0e5a20426e235eaede8f1cf7395f4cc0':
  Produce error rather than assert when encountering a nested function.
2009-09-18 15:09:03 -07:00
Jack Palevich 1c60e46e0e Produce error rather than assert when encountering a nested function.
Remove extra '\n' characters from error messages.

Dynamically allocate error message buffer.
2009-09-18 15:03:03 -07:00
Android Code Review 808c89e120 Merge change 10445
* changes:
  added SuperH atomic support to libcutils
2009-09-17 14:04:33 -07:00
Raphael 55de332b4c am 554c0f35: am 05647c89: Merge change 25170 into eclair
Merge commit '554c0f351b2d02abbbc443a7bb209f800be6f399'

* commit '554c0f351b2d02abbbc443a7bb209f800be6f399':
  Disable sched_policy under Windows.
2009-09-17 10:01:02 -07:00
Rebecca Schultz Zavin 3ba415d77a am 0779a177: am 6388fe80: Merge change 25383 into eclair
Merge commit '0779a177a5f464d936ffa6e092f6c7cd34bfe559'

* commit '0779a177a5f464d936ffa6e092f6c7cd34bfe559':
  Add bitfields to header for screen shots.  This will allow ddms to distinguish
2009-09-17 10:00:58 -07:00
Jean-Baptiste Queru 6b13368ea1 am 75479553: merge from open-source master
Merge commit '754795537596f5a4b8be2205c5bdba63282b3403'

* commit '754795537596f5a4b8be2205c5bdba63282b3403':
  Set permissions properly for any ALSA device under /dev/snd
2009-09-17 09:59:45 -07:00
repo sync a57559001d am da17dee0: resolved conflicts for merge of 35ad5f41 to eclair-plus-aosp
Merge commit 'da17dee0332375abfc1da6d74de851f906c0357b'

* commit 'da17dee0332375abfc1da6d74de851f906c0357b':
  rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support
2009-09-17 09:59:41 -07:00
San Mehat 2a6a43c69b am b183eb18: am 7baff71b: rootdir: init.rc: tweak cfs scheduler - disable child_runs_first
Merge commit 'b183eb18917a099a1a9238003a5bd9c8fa9b1c10'

* commit 'b183eb18917a099a1a9238003a5bd9c8fa9b1c10':
  rootdir: init.rc: tweak cfs scheduler - disable child_runs_first
2009-09-17 09:59:21 -07:00