Commit graph

1439 commits

Author SHA1 Message Date
Jean-Baptiste Queru
92b25666d9 am d8bdf217: resolved conflicts for merge of e577a83a to eclair-plus-aosp
Merge commit 'd8bdf2171af548f321d417147807256e1022c89f'

* commit 'd8bdf2171af548f321d417147807256e1022c89f':
  android-2.1_r1 snapshot
2010-02-05 14:09:38 -08:00
Jean-Baptiste Queru
d8bdf2171a resolved conflicts for merge of e577a83a to eclair-plus-aosp 2010-02-05 08:34:30 -08:00
The Android Open Source Project
e577a83ac1 reconcile main tree with open-source eclair 2010-02-05 08:09:42 -08:00
Dima Zavin
157bf769be Remove libjnigraphics. moved to frameworks/base/native
Change-Id: Ieb65ab1428198a82e583059f75661808f350ea2b
Signed-off-by: Dima Zavin <dima@android.com>
2010-02-04 15:32:07 -08:00
Iliyan Malchev
32f51664c8 am 4f4ccaa1: am 1404c27b: Merge "system/core/init: set proper permissions for tpa2018d1 (CDMA)" into eclair
Merge commit '4f4ccaa1bd079ebc67a97709bbb7ab5ada7449d5'

* commit '4f4ccaa1bd079ebc67a97709bbb7ab5ada7449d5':
  system/core/init: set proper permissions for tpa2018d1 (CDMA)
2010-02-02 14:25:55 -08:00
Iliyan Malchev
4f4ccaa1bd am 1404c27b: Merge "system/core/init: set proper permissions for tpa2018d1 (CDMA)" into eclair
Merge commit '1404c27bff1499dae9b640870ce2251d78cdc5ef' into eclair-plus-aosp

* commit '1404c27bff1499dae9b640870ce2251d78cdc5ef':
  system/core/init: set proper permissions for tpa2018d1 (CDMA)
2010-02-02 14:20:30 -08:00
Iliyan Malchev
1404c27bff Merge "system/core/init: set proper permissions for tpa2018d1 (CDMA)" into eclair 2010-02-02 14:03:43 -08:00
Iliyan Malchev
1340a095ac system/core/init: set proper permissions for tpa2018d1 (CDMA)
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-02-02 13:57:12 -08:00
Raphael
3332d6e69d resolved conflicts for merge of 190cabb3 to master 2010-02-02 08:35:43 -08:00
Raphael
190cabb376 am 1873adc2: ADB: Garmin-Asus\'s USB Vendor ID
Merge commit '1873adc2b12d5a9045bae90650bb331c7c7aa3c7' into eclair-plus-aosp

* commit '1873adc2b12d5a9045bae90650bb331c7c7aa3c7':
  ADB: Garmin-Asus's USB Vendor ID
2010-02-01 15:34:16 -08:00
Raphael
1873adc2b1 ADB: Garmin-Asus's USB Vendor ID
Change-Id: I3249d629f59d40f291079fc214b643ac6c927f76
2010-02-01 09:56:47 -08:00
The Android Open Source Project
4c5e7ffd80 reconcile android-2.1_r1 snapshot 2010-01-29 14:09:59 -08:00
Ben Cheng
4ab909d044 Merge "Bug fix for pre-NEON platforms and enhancement for JIT debugging." 2010-01-29 11:31:45 -08:00
Doug Zongker
5e12d739c6 make DumpPublicKeys write 32-bit values as unsigned
Write the 32-bit chunks of N and RR as unsigned, so we get:

  {64,0xc926ad21,{1795090719,2141396315,950055447,2581568430,4268923165,...

instead of:

  {64,0xc926ad21,{1795090719,2141396315,950055447,-1713398866,-26044131,...

Change-Id: I575224fd7f7c34e06a1b6ae976eaa0bef41d2942
2010-01-29 10:47:38 -08:00
Ben Cheng
2854db8969 Bug fix for pre-NEON platforms and enhancement for JIT debugging.
Use __ARM_NEON__ instead of __VFP_FP__ to detect the need to retrieve FP
registers.

Dump more code around PC and LR to facilitate JIT debugging.
2010-01-28 10:00:03 -08:00
Jean-Baptiste Queru
2f3d96ee5b resolved conflicts for merge of 20f410a4 to master
Change-Id: I187f29848c223c8c548323e0fa20ea0f3b8a3909
2010-01-28 07:38:15 -08:00
Android Git Automerger
9aa6b04533 am 114e398f: Merge commit \'f71f068fb9082ad78c78493c1295074e88a5526c\' into eclair-plus-aosp
Merge commit '114e398f66bf5d521721abfa1933dc989bb5a135'

* commit '114e398f66bf5d521721abfa1933dc989bb5a135':
  Add DELL's USB Vendor ID to adb - DO NOT MERGE
2010-01-27 18:40:16 -08:00
Jean-Baptiste Queru
4544a9f7b4 resolved conflicts for merge of c8472186 to master
Change-Id: I41acaaa3a5d6aeb6873472f17db4cfa756b2d23f
2010-01-27 16:12:23 -08:00
Vasu Nori
4fb0dba990 Merge "dont create sqlite_stmt_journals dir." 2010-01-27 13:34:47 -08:00
Vasu Nori
55a1f0827b dont create sqlite_stmt_journals dir.
this shoudl not be required any longer. in fact, some test-writers are
abusing this dir.
2010-01-26 23:12:37 -08:00
Barry Hayes
b17772dcc8 Break out create_contiguous_mspace_with_base
This routine allows creating a contiguous mspace from raw mapped memory.
In turn, this will enable preallocation of the 3 heap spaces, which will help
remembered sets and zygote/app checks given pointer values.
2010-01-26 13:35:20 -08:00
Andy McFadden
fe5684ef3a Try to fix Mac build.
Throwing in an include of <unistd.h> and <sys/types.h> to get off_t
defined.  Might work.
2010-01-26 09:30:02 -08:00
Andy McFadden
cf63d5d00f Implementation of open_memstream().
POSIX seems to have chosen open_memstream() over the BSD variant.  We
want something for Dalvik that will work on both GNU/Linux and Android,
so this is open_memstream() implemented in terms of BSD funopen().

For Windows there's just a stub that calls abort().

I'm putting this in libcutils since it seems inappropriate for bionic
(which provides the BSD alternatives) but isn't Dalvik-specific.
2010-01-25 15:06:03 -08:00
Nick Pelly
58936f72b2 Merge "Clean fix for the chown race condition on new input devices." 2010-01-22 15:47:13 -08:00
Nick Pelly
6405c6953f Clean fix for the chown race condition on new input devices.
Drop init's egid to AID_INPUT while creating the device node, so that it is
created with the correct gid. This eliminates the
possibility of system_server opening the device node before its permissions
are set correctly.

Using setegid() allows us to swap back to AID_ROOT immediately after mknod().

Bug: 2375632
2010-01-22 11:50:49 -08:00
Android Git Automerger
20f410a418 resolved simple conflict with dc9cf66c 2010-01-21 18:06:39 -08:00
Android Git Automerger
114e398f66 Merge commit 'f71f068fb9082ad78c78493c1295074e88a5526c' into eclair-plus-aosp 2010-01-21 17:58:19 -08:00
Xavier Ducrohet
dc9cf66c6e Merge "Add Dell's vendor ID to fastboot." into eclair 2010-01-21 17:42:36 -08:00
Xavier Ducrohet
af82f21df7 Add Dell's vendor ID to fastboot.
Change-Id: I1d88d2a8b3f5c0a9bade2a207b5d9c5a0b776655
2010-01-21 17:39:25 -08:00
Xavier Ducrohet
f71f068fb9 Add DELL's USB Vendor ID to adb - DO NOT MERGE
Change-Id: Ie1a6b6a81f50956362aee2a2d6d1b805f0e85b7a
2010-01-21 17:24:36 -08:00
Dan Egnor
288c7cfe1b Merge "make "adb bugreport" run "bugreport" (which invokes "dumpstate" indirectly via system service) rather than "dumpstate", that way even when adb is not running as root, dumpstate does run as root, and can do things like collect VM traces." 2010-01-21 17:10:50 -08:00
Erik Gilling
25eab084c5 Merge "adb: add Nvidia's vendor id to adb" 2010-01-21 15:24:44 -08:00
Wink Saville
d89a501f8f resolved conflicts for merge of 988ad28e to master
Change-Id: I02dda00585d5eb4ea74ca7c77bd46f97bb562440
2010-01-21 12:08:07 -08:00
The Android Open Source Project
c8472186e1 merge from open-source master 2010-01-21 11:21:34 -08:00
Kenny Root
91a54c11cb Add x86-64 checking for Darwin
Detect byte endianness when compiled in x86-64 mode in Mac OS X 10.6
Snow Leopard environments or above. Allows compilation of host binaries
in these environments without any changes from its default stock
configuration.

This change doesn't require that the binaries be built in 64-bit, but it
does allow this. One could still use "gcc_select 4.0" with the 10.4 SDK
installed on Snow Leopard to compile in 32-bit mode.

Change-Id: I155a531a9bff450dd6c077b5275652731c59a908
2010-01-21 11:27:10 -06:00
Erik Gilling
6ac5e19299 adb: add Nvidia's vendor id to adb
Signed-off-by: Erik Gilling <konkers@android.com>
2010-01-20 18:19:58 -08:00
Erik Gilling
37e9e90436 fastboot: add Nvidia vendor id to fastboot
Signed-off-by: Erik Gilling <konkers@android.com>
2010-01-20 17:40:30 -08:00
Dan Egnor
c130ea7c29 make "adb bugreport" run "bugreport" (which invokes "dumpstate"
indirectly via system service) rather than "dumpstate", that way
even when adb is not running as root, dumpstate does run as root,
and can do things like collect VM traces.
2010-01-20 13:52:59 -08:00
Colin Cross
eb4ae9c6c3 Merge "Remove definitions that are now in bionic libc" 2010-01-19 13:24:08 -08:00
Mike Lockwood
2b9c1a8b0f Merge "init: Support bugreports to SD card in user builds if adb is enabled." 2010-01-19 12:28:24 -08:00
Mike Lockwood
7a36210cdb init: Support bugreports to SD card in user builds if adb is enabled.
The rationale being that we do not want this enabled by default, but
tying it to adb being enabled allows convenient bugreport collection
for savvy users and developers using production devices.

Change-Id: I71535b33f0774faf1975c98d106080f2ff12e349
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-19 14:41:40 -05:00
Mike Lockwood
37ddce736c adb: Add Dell's USB vendor ID.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-19 11:58:03 -05:00
Mike Lockwood
cc7a5dc770 adb: Add Dell's USB vendor ID.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-19 11:46:08 -05:00
Mike Lockwood
c4fc728e70 Merge "adb: Fix problems detecting adb in more complicated USB configurations." 2010-01-17 14:57:57 -08:00
San Mehat
92175e04a5 rootdir: init.rc: Fix typo in chown of /dev/cpuctl
Signed-off-by: San Mehat <san@google.com>
2010-01-17 12:21:42 -08:00
Mike Lockwood
07e8f7e875 adb: Fix problems detecting adb in more complicated USB configurations.
Change-Id: Ib5b13960a1c75efc97abeca46204c85bba905c71
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-17 00:52:27 -05:00
San Mehat
192277c015 rootdir: init.rc: Add netd to startup services list
Signed-off-by: San Mehat <san@google.com>
2010-01-15 07:48:35 -08:00
John Wang
988ad28e7f am 904ac578: Add gsm_rat_switched event tag.
Merge commit '904ac578d583f4615ee934da3467b84130285c44' into eclair-plus-aosp

* commit '904ac578d583f4615ee934da3467b84130285c44':
  Add gsm_rat_switched event tag.
2010-01-14 17:07:11 -08:00
Colin Cross
1b1fd61295 Remove definitions that are now in bionic libc 2010-01-14 12:47:12 -08:00
John Wang
904ac578d5 Add gsm_rat_switched event tag. 2010-01-13 18:28:15 -08:00