Commit graph

178 commits

Author SHA1 Message Date
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
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
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
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
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
Andy McFadden
33d50dc785 Merge branch 'readonly-p4-master' 2009-04-08 19:26:45 -07:00
Andy McFadden
b33d3415b6 AI 145220: Added "-d" flag to ls.
Now you can "ls -l -d <directory>" to see directory perms.

Automated import of CL 145220
2009-04-08 19:25:35 -07:00
Dianne Hackborn
477b430700 Improvements to get events: -p, better output.
Add new -p option to easily get the output showing which events are reported by the devices.

Improve the reported events output a bit by including a name for each event type.

Extend help text to include a description of each options, so I don't have to look in the source code next time. :)
2009-04-08 15:43:31 -07:00
Wink Saville
83eb023a09 Merge branch 'readonly-p4-master' 2009-04-02 11:02:19 -07:00
Wink Saville
89efdc9c7f AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:57 -07:00
Wink Saville
7bdfb165ad AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:03 -07:00
The Android Open Source Project
455a6dffd4 Merge branch 'open_source' into google_internal 2009-03-29 08:55:26 -07:00
Nick Pelly
0b022b8942 AI 143248: am: CL 142809 am: CL 142808 Don't run hcid through logwrapper.
Original author: npelly
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143248
2009-03-27 15:39:15 -07:00
The Android Open Source Project
7be77b5ba8 Merge commit 'korg/cupcake' 2009-03-27 15:31:14 -07:00
Doug Kwan
e49f9c9238 Automated import from //branches/master/...@142981,142981 2009-03-26 14:14:15 -07:00
Nick Pelly
01161168aa Automated import from //branches/donutburger/...@142809,142809 2009-03-25 18:00:56 -07:00
Nick Pelly
8fbedcf73c Automated import from //branches/cupcake/...@142808,142808 2009-03-25 17:02:32 -07:00
Dianne Hackborn
f441e1e9c4 Automated import from //branches/donutburger/...@140818,140818 2009-03-24 18:36:55 -07:00
Dianne Hackborn
161b03c7ec Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:50 -07:00
The Android Open Source Project
3207e48071 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:09:00 -07:00
The Android Open Source Project
b1487e4c58 auto import //branches/master/...@140412 2009-03-18 22:20:28 -07:00
The Android Open Source Project
f614d64d4b auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:49 -07:00
Jean-Baptiste Queru
83b65486be Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	init/devices.c
	libpixelflinger/Android.mk
2009-03-18 09:29:29 -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
a1e1c1b106 auto import from //depot/cupcake/@132589 2009-03-03 14:04:41 -08:00
The Android Open Source Project
c2d26a164f auto import from //depot/cupcake/@137055 2009-03-02 22:54:47 -08:00