Commit Graph

28140 Commits

Author SHA1 Message Date
Joe Onorato 55ba0461d3 am 0c428e4d: am 91acb148: Revert "adb: Another attempted workaround for the adb disconnect problem."
Merge commit '0c428e4d4f1cec0aa61f897b8466185c9e06de10'

* commit '0c428e4d4f1cec0aa61f897b8466185c9e06de10':
  Revert "adb: Another attempted workaround for the adb disconnect problem."
2009-09-04 11:04:27 -07:00
Jean-Baptiste Queru c31ebf5ff3 merge from open-source master 2009-09-04 07:51:31 -07:00
Joe Onorato 0c428e4d4f am 91acb148: Revert "adb: Another attempted workaround for the adb disconnect problem."
Merge commit '91acb14877e7138879057f794a61ee2fd424a41d' into eclair-plus-aosp

* commit '91acb14877e7138879057f794a61ee2fd424a41d':
  Revert "adb: Another attempted workaround for the adb disconnect problem."
2009-09-03 16:38:51 -07:00
Joe Onorato 91acb14877 Revert "adb: Another attempted workaround for the adb disconnect problem."
This reverts commit cc1de48dcd.

lockwood says to take this out.
2009-09-03 16:35:42 -07:00
Mathias Agopian ca5e0bc3fe android_atomic_write() implementation was using cmpxchg which was useless 2009-09-03 16:31:37 -07:00
Ken Shirriff f602030b35 Add contacts aggregation event to the log. 2009-09-03 16:13:08 -07:00
Mike Lockwood 965144fe48 am d6e3307d: am f56d1b5a: Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."
Merge commit 'd6e3307d02abfd8dc0206a416308fb62f2eb32ee'

* commit 'd6e3307d02abfd8dc0206a416308fb62f2eb32ee':
  Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."
2009-09-03 14:23:11 -07:00
Mike Lockwood b1421c06fe am 410776e1: am e991decf: Merge changes 23694,23695,23696 into eclair
Merge commit '410776e1cf896f152272e71900d2d022846f756f'

* commit '410776e1cf896f152272e71900d2d022846f756f':
  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:23:09 -07:00
Mike Lockwood d6e3307d02 am f56d1b5a: Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."
Merge commit 'f56d1b5a76c6cb282a7689fc93f85de63bd205f6' into eclair-plus-aosp

* commit 'f56d1b5a76c6cb282a7689fc93f85de63bd205f6':
  Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."
2009-09-03 14:21:48 -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
Jean-Baptiste Queru a145741e1c merge from master 2009-09-03 14:18:50 -07:00
Mike Lockwood f56d1b5a76 Revert "adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell."
This reverts commit be0045aafd.
This change broke compatibility with previous versions of adbd, so I will be implementing this
by modifying the bugreport command on the device instead.
2009-09-03 14:54:58 -04:00
Elliott Hughes 90764cfc76 Fix a call to memset(3) with reversed arguments.
Bug: 1999244
2009-09-03 11:52:31 -07:00
Android (Google) Code Review e991decf34 Merge changes 23694,23695,23696 into eclair
* changes:
  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-02 21:40:39 -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
Mike Lockwood c5e7ef2430 init: Add support for enforcing setprop by caller's group.
Change-Id: Ic96e139c4c596882adb38b8863ac6157e0ac17b5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-03 00:36:25 -04:00
Mike Lockwood be0045aafd adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell.
This allows dumpstate to run as root even if adbd is not.

Change-Id: I04bda1ee0c8de91677149a2a9eda713c85067aa4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-03 00:36:14 -04:00
Brian Swetland 7cf1f9d28e am 2552402f: am 69551d85: Merge change 23557 into eclair
Merge commit '2552402f9a4d1a58a95c021a814cc146221df687'

* commit '2552402f9a4d1a58a95c021a814cc146221df687':
  init: add some more audio devices
2009-09-02 16:30:56 -07:00
Brian Swetland 2552402f9a am 69551d85: Merge change 23557 into eclair
Merge commit '69551d85e95d2ba712f083b39f3ff0b32f865e34' into eclair-plus-aosp

* commit '69551d85e95d2ba712f083b39f3ff0b32f865e34':
  init: add some more audio devices
2009-09-02 16:29:19 -07:00
Android (Google) Code Review 69551d85e9 Merge change 23557 into eclair
* changes:
  init: add some more audio devices
2009-09-02 16:26:58 -07:00
Brian Swetland c822213603 init: add some more audio devices
Signed-off-by: Brian Swetland <swetland@google.com>
2009-09-01 17:23:48 -07:00
San Mehat a99f139935 am 991e9189: am 020f35f2: rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.
Merge commit '991e9189a4897fd29bb7a5e4e2fb0b6e0d541e09'

* commit '991e9189a4897fd29bb7a5e4e2fb0b6e0d541e09':
  rootdir: init.rc: Allow all processes access to apanic/ramconsole crash data.
2009-09-01 16:13:56 -07:00
San Mehat b4a87d6f0e am c6a81332: am f26d6cea: rootdir: init.rc: Clean up dump collection
Merge commit 'c6a81332c91e55bedc378534163bb8cab444d3a5'

* commit 'c6a81332c91e55bedc378534163bb8cab444d3a5':
  rootdir: init.rc: Clean up dump collection
2009-09-01 16:13:49 -07: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 3073ad7057 am 8c92ba19: merge from open-source master
Merge commit '8c92ba1921fc8dc3fc7cc39ef854e9ee70fafc67'

* commit '8c92ba1921fc8dc3fc7cc39ef854e9ee70fafc67': (21 commits)
  BUGFIX - ro.kernel.android.{qemud | ril} and ro.android.noril
  Allow an onrestart command to stop the current service
  added chdir/chroot commands to init for mount switching/pivoting
  Trivial implementation of init's import command.
  adb: Fix emulator support.
  Fix broken 'adb root' command.
  adb: Improved support for running adb over TCP/IP
  BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
  adb: Fix infinite loop in Linux host device discovery.
  adb: print better error message when there are insufficient permissions for a device.
  adb: update call to register_usb_transport in Mac and Windows builds.
  adb: On Linux, detect USB devices for which adb does not have permissions to communicate with.
  adb: Use correct language ID when retrieving USB serial number.
  adb: Remove adbd from simulator build.
  adb: add "adb reboot" command.
  get rid of utils/executablepath.h, which now lives in the simulator
  Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
  Fix incorrect check for LOG_UEVENTS
  init.rc: Fixes typo: sytem -> system.
  completed implementation of "trigger" for init
  ...
2009-09-01 12:14:12 -07:00
Jean-Baptiste Queru 8c92ba1921 merge from open-source master 2009-09-01 08:28:21 -07:00
Dima Zavin 0645a5b788 am bdb9831c: am c8401677: init: add vdec device node
Merge commit 'bdb9831ce9195c15ab6f2c01d809fb7946dd2f34'

* commit 'bdb9831ce9195c15ab6f2c01d809fb7946dd2f34':
  init: add vdec device node
2009-08-31 16:45:21 -07:00
San Mehat ad6084e7c8 am c9050c59: am 2dfe490f: system: vold: Ensure a default vold.conf exists for generic target
Merge commit 'c9050c59ea582c74f70ef2f1c87616c6919b0714'

* commit 'c9050c59ea582c74f70ef2f1c87616c6919b0714':
  system: vold: Ensure a default vold.conf exists for generic target
2009-08-31 16:43:24 -07:00
Dima Zavin bdb9831ce9 am c8401677: init: add vdec device node
Merge commit 'c84016778f9efd0d15f3c5ad7b7109833fb45c9a' into eclair-plus-aosp

* commit 'c84016778f9efd0d15f3c5ad7b7109833fb45c9a':
  init: add vdec device node
2009-08-31 14:40:02 -07:00
Dima Zavin c84016778f init: add vdec device node
Change-Id: I7e83b99111adfb2b10ee91b78f922864999d4b9d
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-31 13:40:28 -07:00
San Mehat c9050c59ea am 2dfe490f: system: vold: Ensure a default vold.conf exists for generic target
Merge commit '2dfe490f439e126119055e1888703cc3745f5389' into eclair-plus-aosp

* commit '2dfe490f439e126119055e1888703cc3745f5389':
  system: vold: Ensure a default vold.conf exists for generic target
2009-08-31 08:12:43 -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
Tammo Spalink c624d0e5ec am 7d53c697: am d42ab257: Merge change 23045 into eclair
Merge commit '7d53c697caea3259dbc9212044a5ed9dd87a08be'

* commit '7d53c697caea3259dbc9212044a5ed9dd87a08be':
  Add persistent radio prop perms ; cleanup ws and typos.
2009-08-30 20:21:27 -07:00
Tammo Spalink 7d53c697ca am d42ab257: Merge change 23045 into eclair
Merge commit 'd42ab257604f5fd9e039c843ede477da29f6f3cf' into eclair-plus-aosp

* commit 'd42ab257604f5fd9e039c843ede477da29f6f3cf':
  Add persistent radio prop perms ; cleanup ws and typos.
2009-08-30 20:18:58 -07:00
Android (Google) Code Review d42ab25760 Merge change 23045 into eclair
* changes:
  Add persistent radio prop perms ; cleanup ws and typos.
2009-08-30 20:16:08 -07:00
Tammo Spalink 3dfe6c6664 Add persistent radio prop perms ; cleanup ws and typos.
Change-Id: I7d6b51bbb8a9658179bd01c4ff3b5356ec8b4b6c
2009-08-31 11:10:13 +08:00
Kenny Root 4e5c1c267a Fix use of memset function
memset was called with is second and third arguments reversed resulting
in a virtual no-op.
2009-08-29 09:51:52 -05:00
San Mehat 7ea232e5c1 am a360f292: am 4ad30d28: Merge change 23106 into eclair
Merge commit 'a360f29264fe9c63963e4b789b56b94a5eb8af27'

* commit 'a360f29264fe9c63963e4b789b56b94a5eb8af27':
  vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter
2009-08-28 09:53:55 -07:00
San Mehat a360f29264 am 4ad30d28: Merge change 23106 into eclair
Merge commit '4ad30d2885a801ee23fb44c1edcda051905868c9' into eclair-plus-aosp

* commit '4ad30d2885a801ee23fb44c1edcda051905868c9':
  vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter
2009-08-28 09:51:43 -07:00
Android (Google) Code Review 4ad30d2885 Merge change 23106 into eclair
* changes:
  vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter choose the cluster-size
2009-08-28 09:50:56 -07:00
Joe Onorato ea478b82ca am cc61802b: am ecfd8e73: acc error tweaks
Merge commit 'cc61802bb201f30566dbb05f7386543da173a827'

* commit 'cc61802bb201f30566dbb05f7386543da173a827':
  acc error tweaks
2009-08-28 09:37:19 -07:00
Joe Onorato cc61802bb2 am ecfd8e73: acc error tweaks
Merge commit 'ecfd8e73e4d0102ba01139f9b7ea1e97ce7b79d5' into eclair-plus-aosp

* commit 'ecfd8e73e4d0102ba01139f9b7ea1e97ce7b79d5':
  acc error tweaks
2009-08-28 09:34:56 -07:00
Joe Onorato ecfd8e73e4 acc error tweaks 2009-08-28 09:26:31 -07:00
San Mehat f68a5cdeb7 vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter
choose the cluster-size

Signed-off-by: San Mehat <san@google.com>
2009-08-28 09:18:46 -07:00
Android Code Review e86a2c7ceb Merge change 7315
* changes:
  Allow an onrestart command to stop the current service
2009-08-28 07:18:37 -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
Ben Gruver dc816d5dcd Allow an onrestart command to stop the current service
For example,

service recovery /sbin/recovery
	onrestart start loadkeys
	onrestart class_start con
	onrestart stop recovery

Previously, if you had a service like the above, the "onrestart stop
recovery" clause would not have any effect, because the restart flag
would be re-set after the stop command had executed.

This is similar to a service with the "oneshot" keyword, with the critical
difference being that it executes the other onrestart commands when the
service dies.
2009-08-27 07:58:38 -07:00