Commit graph

1460 commits

Author SHA1 Message Date
Andy McFadden
efca22636f am cc4d11c2: Merge "Fix sim-eng build." into gingerbread
Merge commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae' into gingerbread-plus-aosp

* commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae':
  Fix sim-eng build.
2010-07-01 07:33:21 -07:00
Andy McFadden
cc4d11c245 Merge "Fix sim-eng build." into gingerbread 2010-07-01 07:30:51 -07:00
Andy McFadden
9f6d28dc45 Fix sim-eng build.
Include <stddef.h> to get definition of size_t.  Remove inclusion
of <stdint.h>, which doesn't seem to be needed.

Change-Id: Ib7ff231b5ec4b8c672084801fbb294a50cb7c3d7
2010-06-30 22:20:49 -07:00
Werner Johansson
a8c7404956 am 931bdcc0: Set explicit timeout on USB control transfer
Merge commit '931bdcc09a3d805cf25033951adb95c8e5159e46' into gingerbread-plus-aosp

* commit '931bdcc09a3d805cf25033951adb95c8e5159e46':
  Set explicit timeout on USB control transfer
2010-06-30 21:18:54 -07:00
Werner Johansson
931bdcc09a Set explicit timeout on USB control transfer
This attempts to solve the intermittent issues with serial number
showing up as all question marks when issuing "fastboot devices"
2010-06-30 21:03:46 -07:00
The Android Open Source Project
0e5a6b126e merge from froyo-plus-aosp
Change-Id: I1a3c106234a7910194fe39ca17339796aaf5cfe1
2010-06-25 09:58:37 -07:00
Kenny Root
0b1ff6be08 am eb42170e: Display file sizes larger than 2GB correctly
Merge commit 'eb42170e6c8b70f11dca9965785aa04a80290c72' into gingerbread-plus-aosp

* commit 'eb42170e6c8b70f11dca9965785aa04a80290c72':
  Display file sizes larger than 2GB correctly
2010-06-25 09:50:08 -07:00
Kenny Root
eb42170e6c Display file sizes larger than 2GB correctly
File size was cast to a signed integer which displayed files over 2GB as
negative sizes on devices. Use a long long for printing instead which
matches the stat struct.

Change-Id: I0ec07f33716bb4c2e5d120633ed435f637238f46
2010-06-25 09:08:05 -07:00
Carl Shapiro
2c4676de62 am 93b0cb40: Define inline atomic operations for x86 and ARM.
Merge commit '93b0cb40c18cae594c931677be2b9214420610b7' into gingerbread-plus-aosp

* commit '93b0cb40c18cae594c931677be2b9214420610b7':
  Define inline atomic operations for x86 and ARM.
2010-06-23 14:29:18 -07:00
Carl Shapiro
93b0cb40c1 Define inline atomic operations for x86 and ARM.
This change moves the ARM definitions into GCC extended inline
assembler.  In addition, the same set of x86 definitions are now
shared among all x86 targets.

Change-Id: I6e5aa3a413d0af2acbe5d32994983d35a01fdcb3
2010-06-23 12:51:26 -07:00
The Android Open Source Project
ec219a2ee7 merge from open-source master
Change-Id: I01315984e45ecc0261ea35b5370cbe624cc90cea
2010-06-22 15:30:47 -07:00
Jean-Baptiste Queru
d05d26893d Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
This reverts commit de50fc1a87.
2010-06-22 15:01:31 -07:00
The Android Open Source Project
6d4113f859 merge from open-source master
Change-Id: Ibc43e8da821400022726b119940708efb052908b
2010-06-22 14:21:21 -07:00
Andy McFadden
424875b818 Merge "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP" 2010-06-22 13:15:28 -07:00
The Android Open Source Project
67e6fcd195 merge from froyo-plus-aosp
Change-Id: Ie231effb4d9dfd63aa98ec08b269c31ce32aa1c0
2010-06-21 11:50:42 -07:00
Takeshi Kishimoto
f1792b3d12 am 2124afee: Added NEC and PMC\'s USB VIDs upon their request.
Merge commit '2124afeee1f19423e71c52ede6f4926f5389e917' into gingerbread-plus-aosp

* commit '2124afeee1f19423e71c52ede6f4926f5389e917':
  Added NEC and PMC's USB VIDs upon their request.
2010-06-18 10:33:13 -07:00
Takeshi Kishimoto
2124afeee1 Added NEC and PMC's USB VIDs upon their request.
Change-Id: I332ee1e68ff960d41a365aeb96d012253056edd2
2010-06-18 09:37:35 +08:00
The Android Open Source Project
1adbb607d2 merge from open-source master
Change-Id: I8cfc9c0b699eceef77a905ca2f8cbdb1ab06bf1d
2010-06-15 11:33:39 -07:00
The Android Open Source Project
2ef569417d merge from open-source master
Change-Id: Ia99df155e4abf0585ed46943b75a2a1569d0534f
2010-06-15 11:31:57 -07:00
The Android Open Source Project
ee0306b933 merge from open-source master
Change-Id: I183a933e96222f8c01516210cfa4be5f18e35b70
2010-06-15 11:29:05 -07:00
The Android Open Source Project
d9a1904d3f merge from open-source master
Change-Id: I14853c1f8a1d392d7ee9dfae3914d9ee3107794c
2010-06-15 11:27:36 -07:00
The Android Open Source Project
6f29e5a27b merge from open-source master
Change-Id: I2dacf7f8895debd0452c3601424e32a3b9e19059
2010-06-15 11:26:20 -07:00
The Android Open Source Project
07a804b83a merge from open-source master
Change-Id: Ia8d41f96f3885bd7159571182d09c1da079e5bc9
2010-06-15 11:24:47 -07:00
The Android Open Source Project
f0d644fa23 merge from open-source master
Change-Id: I1ec0e1e702687697eccd3bf6c4f115cac85e382c
2010-06-15 11:23:52 -07:00
Jean-Baptiste Queru
177e78efe6 Merge "- creates proper ifc.h and dhcp.h headers for libnetutils - adds ifc_set_hwaddr - adds hwaddr command to netcfg - code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing - consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties (see related change to WifiStateTracker) - updated system/core/nexus to use new headers, although not sure if anybody still uses nexus" 2010-06-15 10:13:30 -07:00
Michael Richardson
83cb93b401 added vendor ID for http://www.onthegovideo.com/
Change-Id: I38e3a6f252728d93177745778147e6f6ed45d5c5
2010-06-15 09:33:59 -07:00
Jean-Baptiste Queru
feff3a8b8d Merge "eliminate a compiler warning: signed/unsigned length" 2010-06-15 09:31:40 -07:00
Jean-Baptiste Queru
7b67993a9e Merge "adb: optimize socket-list-walking code" 2010-06-15 09:28:26 -07:00
Jean-Baptiste Queru
b660bfc778 Merge "adb: remove unneeded assignment of id to zero" 2010-06-15 09:26:31 -07:00
Jean-Baptiste Queru
1dbfce3dfc Merge "adb: clean up 0 --> NULL for pointers" 2010-06-15 09:24:23 -07:00
Jean-Baptiste Queru
62f4d86b7c Fix build - cpu-features is ARM-specific
Change-Id: I66521f279545a249e3dcb645914f7b66f23cef21
2010-06-15 08:19:56 -07:00
Jean-Baptiste Queru
91012214eb Merge "Adds support for UBFX to JIT and Disassembler" 2010-06-15 07:53:10 -07:00
Michael Richardson
eb558b9240 eliminate a compiler warning: signed/unsigned length
Change-Id: I6139a1b3f9caa8fe3492e4850dcc58d8d5ff0cfb
2010-06-14 14:49:08 -07:00
The Android Open Source Project
50ca0c7720 merge from froyo-plus-aosp
Change-Id: Ibe4e2029776429eea21c7ced877e21607e66504d
2010-06-14 11:53:05 -07:00
André Goddard Rosa
8182829ccb adb: optimize socket-list-walking code
Change-Id: I8bbb8b671c1ce7a2ce736b60b0cdb7b21ccdc372
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
2010-06-14 09:59:34 -07:00
André Goddard Rosa
8e78dc64d2 adb: remove unneeded assignment of id to zero
... as memory was already obtained zero'ed by calloc().

Change-Id: Ic73bad09b54cb778fd40bdf86bb40888ea504c5f
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
2010-06-14 09:56:14 -07:00
André Goddard Rosa
c419e2a210 adb: clean up 0 --> NULL for pointers
Change-Id: I9216fdf534d807a55dfbc6800b5c3ef5f8c83368
2010-06-14 09:55:42 -07:00
Dianne Hackborn
0c6672c66a am 8b0ec20d: Update OOM adj levels.
Merge commit '8b0ec20d6f9636def6740085b203302c1680fa81' into gingerbread-plus-aosp

* commit '8b0ec20d6f9636def6740085b203302c1680fa81':
  Update OOM adj levels.
2010-06-11 10:56:47 -07:00
Dianne Hackborn
8b0ec20d6f Update OOM adj levels.
This introduces some new buckets that will be used by the activity
manager, and adjusts the default levels to match what we had been
setting for Droid.

It turns out Passion has been using the old levels, which makes no
sense for how much memory it has.  Also it is a problem with these
definitions spreading to other projects for different devices, so
I am going to update the defaults to be appropriate for our newer
devices, and put here a file to tune them down for something like
the sapphire.

Change-Id: Ia4f33c4c3b94aeb3656f60b9222072a1d11e9e68
2010-06-10 17:52:37 -07:00
André Goddard Rosa
de50fc1a87 AndroidConfig: define HAVE_PTHREAD_SETNAME_NP
It indicates if the underlying libc provides pthread_setname_np().

Change-Id: Ifef7730970033e834daf2fa710919722d64673e1
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
2010-06-10 15:25:33 -03:00
The Android Open Source Project
75a1d218d8 merge from open-source master
Change-Id: I50b7bc6faa6d0abd4998cae8fc7dda1e8fa49407
2010-06-10 08:51:33 -07:00
Jean-Baptiste Queru
13b012aaff Merge "debuggerd: Show function names in tombstone backtraces" 2010-06-09 17:21:03 -07:00
Jean-Baptiste Queru
f72961d068 merge from froyo-plus-aosp
Change-Id: I82ec6dbd7c8c3b37b9505eaef351042f2ee53fb5
2010-06-09 16:26:32 -07:00
Szymon Jakubczak
c88e09cb98 - creates proper ifc.h and dhcp.h headers for libnetutils
- adds ifc_set_hwaddr
- adds hwaddr command to netcfg
- code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing
- consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties
  (see related change to WifiStateTracker)
- updated system/core/nexus to use new headers, although not sure if
anybody still uses nexus

Change-Id: Idd70c0ac6e89b38e86816578c33eff805d30cac4
2010-06-09 16:11:09 -04:00
The Android Open Source Project
7c84efe083 merge from open-source master
Change-Id: I2f725ca20bf08748a4b3e81a4e98fbe08fcf1a47
2010-06-09 07:16:49 -07:00
David 'Digit' Turner
f2df6bb982 Merge "toolbox-ls: sort file and directory lists" 2010-06-09 04:48:22 -07:00
The Android Open Source Project
36d25509da merge from open-source master
Change-Id: Ie1dc11ee5c184b8f355ca8e2c1a74f86aea4c299
2010-06-08 15:27:25 -07:00
Jean-Baptiste Queru
885e5a7104 Merge "Spell system correctly" 2010-06-08 15:09:55 -07:00
David 'Digit' Turner
aa2106b008 toolbox-ls: sort file and directory lists
Sorts file and directory names properly in 'ls'
+ accept group flags (e.g. '-ld' instead of '-l -d')
+ accept flags in any position on the command line (e.g. 'ls foo -l' works)

Change-Id: Idc24a69ae31fe0c13726d39892357ac89a8830db
2010-06-04 10:44:56 -07:00
The Android Open Source Project
0659dd5625 am c8c8c050: merge from open-source master
Merge commit 'c8c8c050259a0b1222b827b53775e0496c280b7f' into kraken

* commit 'c8c8c050259a0b1222b827b53775e0496c280b7f':
  Improve linenoise.c compatability.
2010-06-04 08:24:02 -07:00