Dmitry Shmidt
ea036dec45
am 2ed5a457
: am 9363b7d5
: dhcp: Add hostname support
...
Merge commit '2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93'
* commit '2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93':
dhcp: Add hostname support
2009-12-14 18:18:28 -08:00
Dmitry Shmidt
2ed5a4570f
am 9363b7d5
: dhcp: Add hostname support
...
Merge commit '9363b7d5da7e17842432251384f8dc46902ac323' into eclair-mr2-plus-aosp
* commit '9363b7d5da7e17842432251384f8dc46902ac323':
dhcp: Add hostname support
2009-12-14 16:41:43 -08:00
Dmitry Shmidt
9363b7d5da
dhcp: Add hostname support
...
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2009-12-14 16:05:34 -08:00
Romain Guy
311add489e
Add adb reboot-bootloader to match fastboot reboot-bootloader.
...
Also fix the formatting of one of the options in the help message.
2009-12-14 14:45:17 -08:00
Barry Hayes
8cd186d9e0
Fix bogus pointer math.
2009-12-10 13:26:00 -08:00
Mike Reed
b80acad7d6
am eedfd9d5
: am 021529fe
: link explicitly against libskia
...
Merge commit 'eedfd9d50490886cb681c0b73ef34649f3d94360'
* commit 'eedfd9d50490886cb681c0b73ef34649f3d94360':
link explicitly against libskia
2009-12-09 18:38:19 -08:00
Mike Reed
a4e26ca940
am f8190342
: am 086d66dc
: Merge change Ib5291c02 into eclair-mr2
...
Merge commit 'f8190342e7fad57a9540316bb1bc3125a3ebd6aa'
* commit 'f8190342e7fad57a9540316bb1bc3125a3ebd6aa':
first impl for NDK access to bitmaps
2009-12-09 18:38:15 -08:00
San Mehat
ecfd7eae2d
am eaa8432d
: am 1b217b0c
: system: vold: Conditionalize build (default on)
...
Merge commit 'eaa8432d3f5495f19a06836501d7538211529d98'
* commit 'eaa8432d3f5495f19a06836501d7538211529d98':
system: vold: Conditionalize build (default on)
2009-12-09 18:38:11 -08:00
Mike Reed
eedfd9d504
am 021529fe
: link explicitly against libskia
...
Merge commit '021529fe63d931815fe7aad09578caf130c28670' into eclair-mr2-plus-aosp
* commit '021529fe63d931815fe7aad09578caf130c28670':
link explicitly against libskia
2009-12-09 15:47:38 -08:00
Mike Reed
f8190342e7
am 086d66dc
: Merge change Ib5291c02 into eclair-mr2
...
Merge commit '086d66dc9c7d0e11f924f8346a67f5c8f4bb4d33' into eclair-mr2-plus-aosp
* commit '086d66dc9c7d0e11f924f8346a67f5c8f4bb4d33':
first impl for NDK access to bitmaps
2009-12-09 15:47:12 -08:00
San Mehat
eaa8432d3f
am 1b217b0c
: system: vold: Conditionalize build (default on)
...
Merge commit '1b217b0c6d36b7f6f550f45d2b694b0f154a22b7' into eclair-mr2-plus-aosp
* commit '1b217b0c6d36b7f6f550f45d2b694b0f154a22b7':
system: vold: Conditionalize build (default on)
2009-12-09 15:45:43 -08:00
Mike Reed
021529fe63
link explicitly against libskia
2009-12-08 13:20:58 -05:00
Android (Google) Code Review
086d66dc9c
Merge change Ib5291c02 into eclair-mr2
...
* changes:
first impl for NDK access to bitmaps
2009-12-08 09:59:47 -08:00
San Mehat
1b217b0c6d
system: vold: Conditionalize build (default on)
...
Signed-off-by: San Mehat <san@google.com>
2009-12-08 08:55:00 -08:00
Mike Reed
83782909a3
am 31b5d4b9
: am 45e5ca1c
: Merge change I0deb0117 into eclair-mr2
...
Merge commit '31b5d4b98e8079a1d97aff8dc3e0824b95d1e294'
* commit '31b5d4b98e8079a1d97aff8dc3e0824b95d1e294':
NDK header for accessing pixels of a java bitmap
2009-12-07 18:30:48 -08:00
Ben Winslow
97a5f615ee
am 6d83685d
: am 88660fa5
: vold: Check partitions 1-4 instead of 0-3
...
Merge commit '6d83685d5bf146835977e56017f8c485932e8047'
* commit '6d83685d5bf146835977e56017f8c485932e8047':
vold: Check partitions 1-4 instead of 0-3
2009-12-07 14:58:43 -08:00
Doug Zongker
0d43429100
am 7bae08ca
: am dd75019d
: remove ActivityManager-related event log tags
...
Merge commit '7bae08ca9d7ed068f97549e904e2a4e2bba1614e'
* commit '7bae08ca9d7ed068f97549e904e2a4e2bba1614e':
remove ActivityManager-related event log tags
2009-12-07 14:57:59 -08:00
Mike Reed
8cd7bd5efb
first impl for NDK access to bitmaps
2009-12-07 16:36:12 -05:00
Mike Reed
31b5d4b98e
am 45e5ca1c
: Merge change I0deb0117 into eclair-mr2
...
Merge commit '45e5ca1c7047b20d36bd31b30b7d2a4786baab0f' into eclair-mr2-plus-aosp
* commit '45e5ca1c7047b20d36bd31b30b7d2a4786baab0f':
NDK header for accessing pixels of a java bitmap
2009-12-07 06:18:51 -08:00
Android (Google) Code Review
45e5ca1c70
Merge change I0deb0117 into eclair-mr2
...
* changes:
NDK header for accessing pixels of a java bitmap
2009-12-07 06:15:53 -08:00
Ben Winslow
6d83685d5b
am 88660fa5
: vold: Check partitions 1-4 instead of 0-3
...
Merge commit '88660fa5d897a74f2fe07f4b827d37a453e32181' into eclair-mr2-plus-aosp
* commit '88660fa5d897a74f2fe07f4b827d37a453e32181':
vold: Check partitions 1-4 instead of 0-3
2009-12-05 10:32:03 -08:00
Ben Winslow
88660fa5d8
vold: Check partitions 1-4 instead of 0-3
...
In mmc_bootstrap_mmcblk, bootstrap partitions 1-4 instead of 0-3, since
that's how the kernel labels them. Additionally, use the NDOSPART constant
from diskmbr.h instead of hardcoding 4 when scanning partitions.
Signed-off-by: San Mehat <san@google.com>
2009-12-05 10:28:09 -08:00
Doug Zongker
7bae08ca9d
am dd75019d
: remove ActivityManager-related event log tags
...
Merge commit 'dd75019da80cf49361fd355d4d6b66c02c73896e' into eclair-mr2-plus-aosp
* commit 'dd75019da80cf49361fd355d4d6b66c02c73896e':
remove ActivityManager-related event log tags
2009-12-04 22:50:30 -08:00
Doug Zongker
dd75019da8
remove ActivityManager-related event log tags
...
These have been migrated to the ActivityManagerService package.
2009-12-04 16:47:40 -08:00
Doug Zongker
f0e57609ec
am 5f168861
: am a43d2753
: remove system server tags from global event.logtags file
...
Merge commit '5f168861beceef1d8c2220993c56312ce0b87dfd'
* commit '5f168861beceef1d8c2220993c56312ce0b87dfd':
remove system server tags from global event.logtags file
2009-12-04 12:07:21 -08:00
Doug Zongker
5f168861be
am a43d2753
: remove system server tags from global event.logtags file
...
Merge commit 'a43d27539156daf08b34bcaa07661fe0e66fa345' into eclair-mr2-plus-aosp
* commit 'a43d27539156daf08b34bcaa07661fe0e66fa345':
remove system server tags from global event.logtags file
2009-12-04 12:04:48 -08:00
Android (Google) Code Review
3c47f68d46
Merge change I85967b66
...
* changes:
Encrypted File Systems Project.
2009-12-04 11:51:03 -08:00
Doug Zongker
a43d275391
remove system server tags from global event.logtags file
...
These tags are being moved to a .logtags file in the system server
package.
2009-12-04 10:43:41 -08:00
Mike Reed
22078f2c05
NDK header for accessing pixels of a java bitmap
2009-12-04 09:40:42 -05:00
Doug Zongker
ac854f3376
am 73bec02c
: am 7fa28666
: Merge change I502d5a9b into eclair-mr2
...
Merge commit '73bec02cc3c5e4598c5a4c56cf7843b5a24af31d'
* commit '73bec02cc3c5e4598c5a4c56cf7843b5a24af31d':
construct event-log-tags via the new build mechanism
2009-12-04 04:31:09 -08:00
San Mehat
d7dbd7b78a
am f95837a1
: am cf9f442e
: am c1c38dd0
: system: sched_policy: Don\'t return an error when the thread we\'re trying to move exits on us
...
Merge commit 'f95837a1e13c9b63bfe0b0f95f00ec0d72ba2e74'
* commit 'f95837a1e13c9b63bfe0b0f95f00ec0d72ba2e74':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
2009-12-04 04:22:14 -08:00
Doug Kwan
092799072f
Add missing symbol type directives.
2009-12-03 17:20:58 -08:00
Doug Zongker
73bec02cc3
am 7fa28666
: Merge change I502d5a9b into eclair-mr2
...
Merge commit '7fa286662790bce1687bd4ff25a6735491392b9c' into eclair-mr2-plus-aosp
* commit '7fa286662790bce1687bd4ff25a6735491392b9c':
construct event-log-tags via the new build mechanism
2009-12-03 17:05:42 -08:00
Android (Google) Code Review
7fa2866627
Merge change I502d5a9b into eclair-mr2
...
* changes:
construct event-log-tags via the new build mechanism
2009-12-03 16:58:53 -08:00
San Mehat
f95837a1e1
am cf9f442e
: am c1c38dd0
: system: sched_policy: Don\'t return an error when the thread we\'re trying to move exits on us
...
Merge commit 'cf9f442ef336d4fb6300318a3137b23a4697e048' into eclair-mr2-plus-aosp
* commit 'cf9f442ef336d4fb6300318a3137b23a4697e048':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
2009-12-03 16:38:09 -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
San Mehat
cf9f442ef3
am c1c38dd0
: system: sched_policy: Don\'t return an error when the thread we\'re trying to move exits on us
...
Merge commit 'c1c38dd01c43079ed24b9030bc8a20c649bacc3f' into eclair-mr2
* commit 'c1c38dd01c43079ed24b9030bc8a20c649bacc3f':
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
2009-12-03 12:45:03 -08:00
San Mehat
c1c38dd01c
system: sched_policy: Don't return an error when the thread we're trying to move exits on us
...
Signed-off-by: San Mehat <san@google.com>
2009-12-03 12:19:12 -08:00
Doug Zongker
da077ee77a
construct event-log-tags via the new build mechanism
...
The build system now unions together all *.logtags files found in
LOCAL_SRC_FILES to construct /system/etc/event-log-tags.
2009-12-03 10:35:41 -08:00
Andy McFadden
3bfdcc979d
Minor tweaks to debuggerd.
...
Changed "process has crashed" message:
- say ":5039" instead of ":port" so mouse-paste of command is trivial
- removed trailing spaces, which consume log buffer to little effect
- improved (I hope) the short explanation of what's going on and
what the HOME key does
Fixed typo ("ignorning").
2009-12-01 15:56:30 -08:00
Dan Egnor
e7629a3bea
am ab12933e
: am f837a755
: am bf95c70f
: 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 'ab12933ee0f4082a7585c19062fd7a7a1d16a6bc'
* commit 'ab12933ee0f4082a7585c19062fd7a7a1d16a6bc':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
2009-11-29 19:48:18 -08:00
Dan Egnor
ab12933ee0
am f837a755
: am bf95c70f
: 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 'f837a7551e78e53ae1478023283fac60f3426cd4' into eclair-mr2-plus-aosp
* commit 'f837a7551e78e53ae1478023283fac60f3426cd4':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
2009-11-29 19:44:09 -08:00
Dan Egnor
f837a7551e
am bf95c70f
: 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 'bf95c70f83ebb1a3ea92ca3fa440c7ee21e7f6af' into eclair-mr2
* commit 'bf95c70f83ebb1a3ea92ca3fa440c7ee21e7f6af':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
2009-11-29 19:39:11 -08:00
Mike Lockwood
255ed555d6
am 3c0c6dca
: am 64e99545
: adb: fix -d and -e options for "adb forward" command.
...
Merge commit '3c0c6dca1abc350035efedafa9ee9d705499c334'
* commit '3c0c6dca1abc350035efedafa9ee9d705499c334':
adb: fix -d and -e options for "adb forward" command.
2009-11-28 19:34:13 -08:00
Mike Lockwood
3c0c6dca1a
am 64e99545
: adb: fix -d and -e options for "adb forward" command.
...
Merge commit '64e99545d4b5600bb5ca044fcad636ae8389b381' into eclair-mr2-plus-aosp
* commit '64e99545d4b5600bb5ca044fcad636ae8389b381':
adb: fix -d and -e options for "adb forward" command.
2009-11-28 19:32:17 -08:00
Mike Lockwood
64e99545d4
adb: fix -d and -e options for "adb forward" command.
...
Change-Id: I9166572a1c398ce5ef1423d19a30895385118ee5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-28 12:46:13 -05:00
Android (Google) Code Review
feb187002d
Merge change Iba48fe2f
...
* changes:
Fix memory deallocation bug in toy vector class.
2009-11-26 19:52:30 -08:00
Jack Palevich
ba48fe2f4e
Fix memory deallocation bug in toy vector class.
...
Yet another reason to use standard collection classes. :-)
2009-11-27 11:51:36 +08:00
Dan Egnor
9d76a44619
am d2633cb7
: 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 'd2633cb70978b42bc8b2c524951a39de197a5edd'
* commit 'd2633cb70978b42bc8b2c524951a39de197a5edd':
Don't copy /proc/last_kmsg to /data/dontpanic/last_kmsg --
2009-11-24 14:58:45 -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