Commit Graph

16404 Commits

Author SHA1 Message Date
Mathias Agopian d6b819166c Merge commit 'goog/master' into merge_master 2009-05-08 13:13:14 -07:00
Mike Lockwood 6e1683f5a7 am b377955: init: Fix some broken code that did not cause problems until
Merge commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672'

* commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672':
  init: Fix some broken code that did not cause problems until switching to gcc 4.4
2009-05-08 11:36:11 -07:00
Mike Lockwood b3779558dc init: Fix some broken code that did not cause problems until switching to gcc 4.4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-08 14:27:42 -04:00
Android (Google) Code Review 46f208e40d Merge change 1171
* changes:
  Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
2009-05-08 09:07:09 -07:00
Chih-Wei Huang 1ecad9a95c Fix uninitialized variable loop
The following command will usually just fail

 # /system/bin/mount -t proc proc /proc
 ioctl LOOP_SET_FD failed: Bad file number

The simple patch fixes the issue.
2009-05-08 10:44:30 +08:00
Mathias Agopian ab15ac0881 Merge commit 'goog/master' into merge_master 2009-05-07 17:46:47 -07:00
Nick Pelly db44926403 Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
Overridden by -s.
2009-05-07 12:48:03 -07:00
San Mehat fec961705b am 3d40729: libsysutils: Add string.h to includes
Merge commit '3d40729054803fae1c4d4bb5ac7554665a132b26'

* commit '3d40729054803fae1c4d4bb5ac7554665a132b26':
  libsysutils: Add string.h to includes
2009-05-07 08:52:16 -07:00
San Mehat 3d40729054 libsysutils: Add string.h to includes
Signed-off-by: San Mehat <san@google.com>
2009-05-07 08:49:30 -07:00
Android (Google) Code Review e17cad55c2 am 9029056: Merge changes 1093,1094 into donut
Merge commit '902905682da7247aac3a73a71057e87f9758f0b1'

* commit '902905682da7247aac3a73a71057e87f9758f0b1':
  init.rc: Add Nexus to services (disabled for now)
  nexus: Initial checkin of Nexus - android native network management daemon.
2009-05-07 07:21:17 -07:00
Android (Google) Code Review 902905682d Merge changes 1093,1094 into donut
* changes:
  init.rc: Add Nexus to services (disabled for now)
  nexus: Initial checkin of Nexus - android native network management daemon.
2009-05-07 07:21:15 -07:00
Android (Google) Code Review 9399844278 am 747baad: Merge change 1092 into donut
Merge commit '747baadddb37737b0ecf83f6147a5e3252a34b12'

* commit '747baadddb37737b0ecf83f6147a5e3252a34b12':
  libsysutils: New C++ system convenience library
2009-05-07 07:06:55 -07:00
Android (Google) Code Review 747baadddb Merge change 1092 into donut
* changes:
  libsysutils: New C++ system convenience library
2009-05-07 07:03:23 -07:00
Android (Google) Code Review 493726bc81 am 2780827: Merge change 1005 into donut
Merge commit '27808271934622e6473d7d664303fa3efb4cd662'

* commit '27808271934622e6473d7d664303fa3efb4cd662':
  Make the /dev/qemu_trace device readable and writable by all.
2009-05-06 15:22:11 -07:00
Android (Google) Code Review 2780827193 Merge change 1005 into donut
* changes:
  Make the /dev/qemu_trace device readable and writable by all.
2009-05-06 15:20:29 -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 dc266073e7 nexus: Initial checkin of Nexus - android native network management daemon.
Initial skelaton

Signed-off-by: San Mehat <san@google.com>
2009-05-06 15:20:16 -07:00
San Mehat 168415b822 libsysutils: New C++ system convenience library
This library contains re-usable classes for common
    system level daemons. Initial consumers of this library
    are 'nexus' and 'vold2'

Signed-off-by: San Mehat <san@google.com>
2009-05-06 15:12:02 -07:00
Dima Zavin 06c6589b10 am 770354d: init: Fix segfault when log_write() was missing an arg to fo
Merge commit '770354d7e6cd471daed426fcf04bf7246e7cb18b'

* commit '770354d7e6cd471daed426fcf04bf7246e7cb18b':
  init: Fix segfault when log_write() was missing an arg to format.
2009-05-05 20:36:35 -07:00
Dima Zavin 770354d7e6 init: Fix segfault when log_write() was missing an arg to format.
Also, flag log_write() as a printf-like beast to gcc.

Signed-off-by: Dima Zavin <dima@android.com>
2009-05-05 18:35:00 -07:00
Jack Veenstra 4a762357d0 Make the /dev/qemu_trace device readable and writable by all.
This is needed so that the Dalvik interpreter can add information
about Java method entry/exit to the traces when running in the qemu
emulator.
2009-05-05 11:48:17 -07:00
Android (Google) Code Review 9b3174477d Merge change 916
* changes:
  Fix a potential integer overflow bug that could result in memory overwrites. Also add a check to the result of malloc()
2009-05-04 01:26:38 -07:00
David 'Digit' Turner a26c4e049a Fix a potential integer overflow bug that could result in memory overwrites.
Also add a check to the result of malloc()
2009-05-02 19:43:30 +02:00
Mathias Agopian 8cd81ab3f2 get rid of native_handle_{dup|copy} since they were not used any longer 2009-05-02 00:06:41 -07:00
Android (Google) Code Review 318897a5c2 am feb3d6d: Merge change 877 into donut
Merge commit 'feb3d6d8db30f51c560e792ef3d9eca01d9cae9d'

* commit 'feb3d6d8db30f51c560e792ef3d9eca01d9cae9d':
  adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too.
2009-05-01 08:52:14 -07:00
Android (Google) Code Review feb3d6d8db Merge change 877 into donut
* changes:
  adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too. While adb is not needed for the simulator, it's handy to have around when you're working with the simulator but need to look at a device.
2009-05-01 08:51:05 -07:00
Marco Nelissen b9e966f56b adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too.
While adb is not needed for the simulator, it's handy to have around when you're working with the simulator but need to look at a device.
2009-05-01 08:15:55 -07:00
Dima Zavin b55cf93e25 am 95ec983: fastboot: Update the help message with -b argument
Merge commit '95ec983887867a117f4ef87073495111aff4a506'

* commit '95ec983887867a117f4ef87073495111aff4a506':
  fastboot: Update the help message with -b argument
2009-04-30 17:04:06 -07:00
Dima Zavin 95ec983887 fastboot: Update the help message with -b argument
Signed-off-by: Dima Zavin <dima@android.com>
2009-04-30 15:03:05 -07:00
Mathias Agopian f313711450 Merge commit 'goog/master' into merge_master 2009-04-30 14:08:52 -07:00
Android (Google) Code Review 7e3424b9c1 am 8634c6c: Merge change 685 into donut
Merge commit '8634c6cf602efae71326fa7b3910d9034378287a'

* commit '8634c6cf602efae71326fa7b3910d9034378287a':
  fastboot, mkbootimg: support alternate base addresses
2009-04-29 15:17:35 -07:00
San Mehat e4da6a1a79 am cb9ae42: system/core: Remove old mountd code
Merge commit 'cb9ae42cd22cca46744bb964a2c412b145225748'

* commit 'cb9ae42cd22cca46744bb964a2c412b145225748':
  system/core: Remove old mountd code
2009-04-29 15:17:35 -07:00
Android (Google) Code Review 9fe0f0d14d am 6181f70: Merge change 484 into donut
Merge commit '6181f70bd40fd020661841923e725df75a3a2793'

* commit '6181f70bd40fd020661841923e725df75a3a2793':
  filesystem: Add new group 'sdcard_rw' for restricting sd card write access
2009-04-29 15:17:35 -07:00
Android (Google) Code Review 8634c6cf60 Merge change 685 into donut
* changes:
  fastboot, mkbootimg: support alternate base addresses
2009-04-28 16:20:10 -07:00
Brian Swetland 2a63bb7abf fastboot, mkbootimg: support alternate base addresses
Add the --base flag to mkbootimg and -b flag to fastboot, to allow
the default kernel base address (0x10000000) to be changed.

Signed-off-by: Brian Swetland <swetland@google.com>
2009-04-28 16:05:07 -07:00
Mathias Agopian e9fcaf04f2 Merge commit 'goog/master' into merge_master 2009-04-28 15:24:01 -07:00
San Mehat cb9ae42cd2 system/core: Remove old mountd code
Signed-off-by: San Mehat <san@google.com>
2009-04-27 10:17:34 -07:00
Android (Google) Code Review 6181f70bd4 Merge change 484 into donut
* changes:
  filesystem: Add new group 'sdcard_rw' for restricting sd card write access
2009-04-23 11:45:13 -07:00
San Mehat 6e1f21584f filesystem: Add new group 'sdcard_rw' for restricting sd card write access
Signed-off-by: San Mehat <san@google.com>
2009-04-23 09:15:08 -07:00
Jean-Baptiste Queru 63d5ac6157 Merge donut into master 2009-04-22 18:33:20 -07:00
Jean-Baptiste Queru ca983f98ba merge cupcake into donut 2009-04-22 17:57:01 -07:00
Jean-Baptiste Queru f6c95712c4 Merge donut into master 2009-04-22 17:12:44 -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
Chung-yih Wang 41e3a2c5e8 Merge branch 'readonly-p4-master' 2009-04-18 16:17:34 -07:00
Chung-yih Wang f309f77adc AI 146558: am: CL 146260 Add the net-based routing entries.
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10
  Original author: cywang

Automated import of CL 146558
2009-04-18 16:16:21 -07:00
Mathias Agopian cccf42773a fix copyright notice 2009-04-17 15:16:02 -07:00
Mathias Agopian b5fbd75f6c add a compiler.h to libcutils. it's intended to define compiler-dependent macros.
currently, it defines CC_LIKELY and CC_UNLIKELY.
2009-04-17 14:43:36 -07:00
Chung-yih Wang 8b0fb371c1 Merge branch 'readonly-p4-donut' into donut 2009-04-14 18:46:50 -07:00
Chung-yih Wang 98c297f244 AI 146260: Add the net-based routing entries.
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10

Automated import of CL 146260
2009-04-14 18:45:32 -07:00
Mathias Agopian 61d8e487e6 Merge commit 'goog/master' into master_gl 2009-04-10 14:26:14 -07:00