Commit Graph

1463 Commits

Author SHA1 Message Date
The Android Open Source Project 71122f9a53 am d6391c6a: merge from open-source master
Merge commit 'd6391c6aaaa40c20761b7a2a8d4be115163e4194'

* commit 'd6391c6aaaa40c20761b7a2a8d4be115163e4194':
  ADB: Garmin-Asus's USB Vendor ID
  adb: add Nvidia's vendor id to adb
  make "adb bugreport" run "bugreport" (which invokes "dumpstate"
  adb: Fix problems detecting adb in more complicated USB configurations.
  Make adb pull use . as the target file directory if you don't supply one.
2010-02-23 18:57:49 -08:00
San Mehat 8ccb3a55ce system: Remove dead vold1 code
Signed-off-by: San Mehat <san@google.com>
2010-02-23 17:18:54 -08:00
The Android Open Source Project d6391c6aaa merge from open-source master 2010-02-23 07:32:01 -08:00
Takeshi Kishimoto 01512aa3b0 Added ZTE's USB Vendor ID (0x19D2) upon ZTE's request. 2010-02-22 19:30:41 +08:00
Chia-chi Yeh bbfe1368d9 Remove dead services from init.rc. 2010-02-22 09:32:16 +08:00
San Mehat 6f957c3f25 generic_rootdir: vold_fstab: Change '/sdcard' -> '/mnt/sdcard'
Signed-off-by: San Mehat <san@google.com>
2010-02-19 18:38:28 -08:00
San Mehat 6ea3cc6089 rootdir: init.rc: Create secure staging directories, and a compat symlink
Signed-off-by: San Mehat <san@google.com>
2010-02-19 18:38:28 -08:00
Mike Lockwood 0ef3fd048a adb: add -s option to adb install for installing apps on SD card.
Change-Id: Ic6b24411e594d160ddcf862cc9f1283e1e17bb4d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-02-19 17:53:27 -05:00
Keith Preston b45b5c9f22 Fix Heap Corruption from too long of a TAG
snprintf has a weird return value.   It returns what would have been written given a large enough buffer.
In the case that the prefix is longer then our buffer(128), it messes up the calculations below possibly causing heap corruption.
To avoid this we double check and set the length at the maximum (size minus null byte
2010-02-18 15:33:28 -06:00
Mathias Agopian fa36f2c3b7 fix [2448319] out of bounds array index in fog 2010-02-16 21:01:12 -08:00
Mathias Agopian 5dca849345 remove unused YUV constants 2010-02-16 16:54:53 -08:00
Dima Zavin 8e4f143d45 pixelflinger: add defines for nv12_tiled semi-planar and nv21 semi-planar
Change-Id: Ib56c19f3c5a71730dd7a7a82b10a59c2bb9b5de8
Signed-off-by: Dima Zavin <dima@android.com>
2010-02-16 15:14:26 -08:00
Andy Stadler a1dca2fd9c Merge "Allow numeric uid & gid in chown" 2010-02-16 11:16:31 -08:00
Dima Zavin 931175a1c5 fastboot: add nand page size param, used for boot and flash:raw commands
Change-Id: I07451363f4d4ac8665598722491968e6ee0953ee
Signed-off-by: Dima Zavin <dima@android.com>
2010-02-16 09:40:05 -08:00
Satoshi Kataoka d77caaa94e Merge "Added USB vendor id of Sharp, based on Sharp's request. Sharp's vendor id: 0x04dd" 2010-02-15 17:00:09 -08:00
Raphael 5a912bf03e ADB: Garmin-Asus's USB Vendor ID
Change-Id: I3249d629f59d40f291079fc214b643ac6c927f76
2010-02-15 12:00:48 -05:00
Erik Gilling 2f6c2b04fb adb: add Nvidia's vendor id to adb
Signed-off-by: Erik Gilling <konkers@android.com>
2010-02-15 11:59:54 -05:00
Dan Egnor 7eced2b86a 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-02-15 11:59:47 -05:00
Mike Lockwood 429c5ae461 adb: Fix problems detecting adb in more complicated USB configurations.
Change-Id: Ib5b13960a1c75efc97abeca46204c85bba905c71
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-02-15 11:59:04 -05:00
Joe Onorato 8071a4bdb6 Make adb pull use . as the target file directory if you don't supply one. 2010-02-15 11:58:56 -05:00
Andrew Stadler 715c889713 Allow numeric uid & gid in chown
This makes it more like the POSIX version which accepts number or name.
2010-02-12 13:46:58 -08:00
Dan Egnor 9b0bf52944 Remove some log tags, which have moved to their own
EventLogTags.logtags file in various directories.
2010-02-10 21:19:45 -08:00
Takeshi Kishimoto 123331adea Added USB vendor id of Sharp, based on Sharp's request.
Sharp's vendor id: 0x04dd
2010-02-09 18:10:36 +08:00
Barry Hayes 2dcf1fb9ff Merge "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-02-08 20:46:41 -08:00
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