Commit Graph

1739 Commits

Author SHA1 Message Date
Mike Lockwood 5ab8fed240 Merge changes Iac3d757b,Ic31463d2,I27e95c1d,Ibd6e8769
* changes:
  Revert "adb: Use new libusbhost library for USB support on Linux host."
  Revert "adb: remove unnecessary include"
  Revert "adb: Adjust usb_linux.c for changes in libusbhost API."
  Revert "adb: avoid potential race conditions in detecting device disconnects"
2010-06-14 14:47:34 -07:00
Mike Lockwood ac3d757b81 Revert "adb: Use new libusbhost library for USB support on Linux host."
This reverts commit d7249c45f6.
2010-06-14 14:44:23 -07:00
Mike Lockwood c31463d244 Revert "adb: remove unnecessary include"
This reverts commit e380c27e9f.
2010-06-14 14:44:13 -07:00
Mike Lockwood 27e95c1daf Revert "adb: Adjust usb_linux.c for changes in libusbhost API."
This reverts commit 36b99e4cac.
2010-06-14 14:43:50 -07:00
Mike Lockwood bd6e87693f Revert "adb: avoid potential race conditions in detecting device disconnects"
This reverts commit a78012adc8.
2010-06-14 14:43:30 -07:00
Mike Lockwood fc86c58a08 Merge "adb: avoid potential race conditions in detecting device disconnects" 2010-06-14 12:11:58 -07:00
Mike Lockwood a78012adc8 adb: avoid potential race conditions in detecting device disconnects
I am hoping this will fix b/2767449 and b/2752393

Change-Id: I230310d37f50eb2a2e1bad31e374427fd44393a5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-14 12:11:31 -07:00
The Android Open Source Project 044422e828 am 50ca0c77: merge from froyo-plus-aosp
Merge commit '50ca0c7720b66cfc322247b7f407b3cbe5823053'

* commit '50ca0c7720b66cfc322247b7f407b3cbe5823053':
  debuggerd: Show function names in tombstone backtraces
2010-06-14 11:55:44 -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 c594780674 am 0c6672c6: am 8b0ec20d: Update OOM adj levels.
Merge commit '0c6672c66a93f7a81d07ff3f59eee87ddb16db3c'

* commit '0c6672c66a93f7a81d07ff3f59eee87ddb16db3c':
  Update OOM adj levels.
2010-06-11 11:00:40 -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
Nick Kralevich 7ad012bde5 Merge "Mount /dev with noexec and nosuid" 2010-06-10 16:16:04 -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
Mike Lockwood e15af09876 libusbhost: Use logcat for debugging when building device library.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-10 10:22:38 -04:00
Jean-Baptiste Queru 13b012aaff Merge "debuggerd: Show function names in tombstone backtraces" 2010-06-09 17:21:03 -07:00
Jean-Baptiste Queru 7570ab61d4 am f72961d0: merge from froyo-plus-aosp 2010-06-09 16:28:31 -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
Nick Kralevich 4ec97f2b25 Mount /dev with noexec and nosuid
Change-Id: Iea182c1e6a72c281abd17bf83ff765bb9cb59270
2010-06-08 14:40:53 -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 7b84e72cc4 am 0659dd56: am c8c8c050: merge from open-source master 2010-06-04 08:26:49 -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
The Android Open Source Project c8c8c05025 merge from open-source master
Change-Id: I70c032cb8d1b3fbc4ae59c1e408b6fd0d23d4f2a
2010-06-04 08:19:30 -07:00
The Android Open Source Project 6d1b47b505 am c491fdc6: am 6be163b1: merge from open-source master 2010-06-04 08:18:06 -07:00
The Android Open Source Project c491fdc6f5 am 6be163b1: merge from open-source master
Merge commit '6be163b167e986b4fafda9290e5d74fc3945b273' into kraken

* commit '6be163b167e986b4fafda9290e5d74fc3945b273':
  Emit shell prompt even when in non-interactive mode.
2010-06-04 08:16:25 -07:00
The Android Open Source Project 6be163b167 merge from open-source master
Change-Id: I8b1e7e238d9d0e828bea72530b5356b8386e48bc
2010-06-04 08:00:52 -07:00
Jack Palevich 192a288315 Improve linenoise.c compatability.
+ Don't flush characters when switching into and out of raw mode. This
avoids eating characters that follow '\n'. (Such characters can occur
when pasting multiple line input, or when scripts are driving input.)

+ Try to be slightly cleverer about calculating the length of the prompt,
so that prompts with embedded '\n' characters are handled OK. This is
an area that really needs to be replaced with a query of the cursor
position from the terminal.

+ As a hack, just assume the screen is very wide if we don't know how
wide it is. This allows dexpropt to work correctly. (It was getting
confused by the editing commands emitted when the end-of-line was reached.)

Change-Id: I988dd0f0bceb22b298e915be0dde085c9358ef66
2010-06-04 14:32:01 +08:00
Jack Palevich ad5431d2ca Emit shell prompt even when in non-interactive mode.
Change-Id: If85c509efe13e4bdb40216c79d560ea7f83ba813
2010-06-04 12:03:14 +08:00
Colin Cross 6f5096b188 am 982a815c: Reap firmware child processes to prevent zombies 2010-06-03 14:45:19 -07:00
Colin Cross 982a815c10 Reap firmware child processes to prevent zombies
Change-Id: Ic6c50b929a025f05450cd309238e60a857690d9b
2010-06-03 12:21:01 -07:00
The Android Open Source Project 2ddc27d0df am f1a4618e: am 324a98f1: merge from open-source master 2010-06-03 09:21:28 -07:00
The Android Open Source Project 42cd1c99c4 am 7bea36bd: am f7e148c1: merge from open-source master 2010-06-03 09:19:26 -07:00
The Android Open Source Project f1a4618e99 am 324a98f1: merge from open-source master
Merge commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4' into kraken

* commit '324a98f1901fb84ec4c88196e01c3e14c2b5a4a4':
  sh: Fix problem with stray '\r' character that was introduced in previous change
2010-06-03 09:16:51 -07:00
The Android Open Source Project 7bea36bdeb am f7e148c1: merge from open-source master
Merge commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9' into kraken

* commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9':
  adb connect and disconnect improvements:
2010-06-03 09:14:03 -07:00
The Android Open Source Project 324a98f190 merge from open-source master
Change-Id: I6262a725068f89c989e2e6706bcd220ddb217c8e
2010-06-03 09:13:23 -07:00
The Android Open Source Project f7e148c1bc merge from open-source master
Change-Id: I9b051ebd6e785e4d68e148a005a0485e79aa55ea
2010-06-03 09:09:17 -07:00
Christopher Tate f96e700b33 am 25e7b8fc: am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable 2010-06-02 22:23:25 -07:00
Mike Lockwood 1bc4eae349 sh: Fix problem with stray '\r' character that was introduced in previous change
Change-Id: I53148089bcb1989c129c7af465c724495e13e156
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-02 15:08:30 -04:00
Christopher Tate 25e7b8fcc3 am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
Merge commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163' into kraken

* commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163':
  Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
2010-06-02 11:20:39 -07:00
Christopher Tate b1fb3bd13a am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
Merge commit '230cb33fd1ab335c6f808c72db891993b00110a0' into froyo-plus-aosp

* commit '230cb33fd1ab335c6f808c72db891993b00110a0':
  Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
2010-06-02 11:18:36 -07:00
Mike Lockwood cbbe79add1 adb connect and disconnect improvements:
Port number is now optional.  Will use default port 5555 if not specified.
"adb disconnect" with no additional arguments will disconnect all TCP devices.

Change-Id: I7fc26528ed85e66a73b8f6254cea7bf83d98109f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-02 11:31:26 -04:00