Commit Graph

4763 Commits

Author SHA1 Message Date
Nick Kralevich 523a20901b Merge "adb: Use 64 bit capabilities." 2013-02-15 18:07:46 +00:00
Nick Kralevich 109f4e16cb adb: Use 64 bit capabilities.
Fix the following kernel warning:

$ adb shell dmesg | grep adb
<6>[    7.813003] warning: `adbd' uses 32-bit capabilities (legacy support in use)

Change-Id: I3912302c5c577f1cb03f0c591834ab7b3a72ddf5
2013-02-15 09:33:13 -08:00
Elliott Hughes 1736113418 Merge "Add a "smash-stack" option to crasher." 2013-02-14 23:50:21 +00:00
Elliott Hughes df4200e8c2 Add a "smash-stack" option to crasher.
bionic's __stack_chk_fail was preventing debuggerd from dumping
stacks, which was not helpful.

Bug: 2487269
Change-Id: Idba2a274037b960dfb2ac1c21686323268c4b372
2013-02-14 14:41:57 -08:00
Jeffrey Brown 90dd140294 am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
# By Duane Sand
# Via Duane Sand (1) and Gerrit Code Review (1)
* commit '241194cad4b27ffd1cb574cb10c4c6941ef3882f':
  [MIPS] Benchmark test for MIPS memset16/memset32
2013-02-06 20:54:02 -08:00
Jeffrey Brown 1b9a605740 am 44508515: Merge "Tidy up long lines"
# By Duane Sand
# Via Duane Sand (1) and Gerrit Code Review (1)
* commit '445085151cff012efefc329b9fa1a311d1d208be':
  Tidy up long lines
2013-02-06 20:54:01 -08:00
Jeffrey Brown 241194cad4 Merge "[MIPS] Benchmark test for MIPS memset16/memset32" 2013-02-07 04:40:05 +00:00
Jeffrey Brown 445085151c Merge "Tidy up long lines" 2013-02-07 04:32:19 +00:00
Ian Rogers 271d6dfb9c am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
# Via Gerrit Code Review (1) and Ian Rogers (1)
* commit '78432ab1f42d59fed474365b95b7501dcccacebf':
  Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-02-01 17:11:02 -08:00
Ian Rogers 78432ab1f4 Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants." 2013-02-02 00:06:12 +00:00
Jean-Baptiste Queru 825f29b1c8 Merge from jb-mr1.1-dev 2013-02-01 15:37:53 -08:00
Colin Cross 7480c0079d am b2639f40: Merge "Label sockets consistently with the seclabel value if specified."
# By Stephen Smalley
# Via Gerrit Code Review (1) and Stephen Smalley (1)
* commit 'b2639f4015c9fb2ff10c7bfae6074a8d968f5b7e':
  Label sockets consistently with the seclabel value if specified.
2013-02-01 11:31:14 -08:00
Ian Rogers 80c3b278fd Inline ldrex/strex for thumb2, remove ARMv5 remnants.
We assume ARMv7 which with thumb2 has ldrex/strex operations that may be
inlined if -mthumb is defined.
Remove remnants of ARMv5 support.

Change-Id: I9bb9525ae6ff4816ba391115019d841f63c12348
2013-02-01 11:30:31 -08:00
Colin Cross b2639f4015 Merge "Label sockets consistently with the seclabel value if specified." 2013-02-01 19:04:56 +00:00
Devin Kim 6a7a324502 am cf5c32c2: charger: Do not suspend when disconnecting from charger
# Via Iliyan Malchev
* commit 'cf5c32c26c3b458cd9f8d8f7ba07f1fbb8b496e5':
  charger: Do not suspend when disconnecting from charger
2013-02-01 10:55:57 -08:00
choongryeol.lee 9190c0b3fd am dec27f6e: (-s ours) charger: suspend enable in charger mode
# Via Iliyan Malchev
* commit 'dec27f6e11c2bdfe35791d0d25a3b1bb2204d194':
  charger: suspend enable in charger mode
2013-02-01 10:55:56 -08:00
Iliyan Malchev 085943a16c am fdf2f337: libsuspend: compile as a static library
# Via Iliyan Malchev
* commit 'fdf2f337805b0b9c6ebdf57540b2b70bb1eb64dd':
  libsuspend: compile as a static library
2013-01-30 13:34:55 -08:00
Kenny Root 282caf3bd0 am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"
# By Ray Donnelly
# Via Android Git Automerger (1) and others
* commit '260f347197187c0e4ac9bf4afaf049bfa3655afc':
  Windows adb: include stdint.h for uint8_t on MinGW-w64
2013-01-29 21:52:08 -08:00
Kenny Root 6c3d3ccfa5 am d033739d: am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"
# By Ray Donnelly
# Via Android Git Automerger (1) and others
* commit 'd033739d176f8a2da99f80ef4a03bdca0649b644':
  Windows adb: initialize on to 1 in disable_tcp_nagle
2013-01-29 21:52:07 -08:00
Kenny Root 260f347197 am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"
# By Ray Donnelly
# Via Gerrit Code Review (1) and Ray Donnelly (1)
* commit 'f8afaebec3d10879f22406ac1bf06a246d448f93':
  Windows adb: include stdint.h for uint8_t on MinGW-w64
2013-01-29 21:49:37 -08:00
Kenny Root d033739d17 am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"
# By Ray Donnelly
# Via Gerrit Code Review (1) and Ray Donnelly (1)
* commit 'd40fd86ec5bdf56e8cd5a702ffc5332b6de931e4':
  Windows adb: initialize on to 1 in disable_tcp_nagle
2013-01-29 21:49:36 -08:00
Kenny Root f8afaebec3 Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64" 2013-01-30 05:44:17 +00:00
Kenny Root d40fd86ec5 Merge "Windows adb: initialize on to 1 in disable_tcp_nagle" 2013-01-30 05:43:33 +00:00
Doug Zongker 76dd8e3368 resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aosp
Change-Id: Ie513c90bcad779203a241a541945b0cf7c936664
2013-01-29 11:07:41 -08:00
Doug Zongker 8cc97302b2 resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aosp
Change-Id: Ie7a8b642dec0f07d4c8bfd9d8f736fd66c4febe0
2013-01-29 10:50:22 -08:00
Doug Zongker 016806a71b change AID_LOOP_RADIO uid assignment
1029 was taken by an AOSP change; use 1030 instead.

Change-Id: Icfe19a5638a4c98a3e2694c0402d19b49b8face9
2013-01-29 10:47:28 -08:00
Doug Zongker 0fe9742e38 add AID_LOOP_RADIO for control of loop radio device
Change-Id: I1e996dfbaa0f187ec87b5318a214ab0b852193cc
2013-01-29 10:37:51 -08:00
Elliott Hughes db9697b3b0 am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'b94b038df58cb13ae2073a28d5264bf9162d5be5':
  libcorkscrew will always HAVE_DLADDR.
2013-01-29 10:27:36 -08:00
Elliott Hughes b94b038df5 Merge "libcorkscrew will always HAVE_DLADDR." 2013-01-29 17:49:52 +00:00
Elliott Hughes 46d079dd8c libcorkscrew will always HAVE_DLADDR.
The only place we don't have dladdr(3) is Windows, and libcorkscrew
is for Unix.

Change-Id: If7633ee8398bccf9897add728facbe07592c0fcf
2013-01-25 15:39:33 -08:00
Colin Cross 35d5b7e624 am 61ae5dfd: Merge "fastboot: add errno.h to fix windows build"
# Via Colin Cross (1) and Gerrit Code Review (1)
* commit '61ae5dfda0ddf74b5f05446aa1f76f3aa1917202':
  fastboot: add errno.h to fix windows build
2013-01-23 19:50:02 -08:00
Colin Cross 61ae5dfda0 Merge "fastboot: add errno.h to fix windows build" 2013-01-24 03:19:32 +00:00
Colin Cross 81c632e4da fastboot: add errno.h to fix windows build
The removal of extra headers from ext4_utils.h removed an indirect
include of errno.h that breaks building with USE_MINGW=1.

Change-Id: Ic8448db97b5c056a139dc836e1d6f3aaafb917c9
2013-01-23 19:13:43 -08:00
Colin Cross 5fc4fdc6a0 am 2447afdb: Merge "fastboot: use better exported api from libext4_utils"
# Via Colin Cross (1) and Gerrit Code Review (1)
* commit '2447afdb9ee2607b932805bd2efd8006242f4d62':
  fastboot: use better exported api from libext4_utils
2013-01-23 17:35:20 -08:00
Colin Cross 2447afdb9e Merge "fastboot: use better exported api from libext4_utils" 2013-01-24 00:55:08 +00:00
Colin Cross 2aaf5e84f0 fastboot: use better exported api from libext4_utils
Switch fastboot to use an exported api from libext4_utils that
will change less often, and remove some of the implementation
details from fastboot.

Change-Id: I85a10c8f58abe8093d0c781e1a0e100c348ef0d9
2013-01-23 15:43:41 -08:00
Devin Kim cf5c32c26c charger: Do not suspend when disconnecting from charger
The device should be power off when disconnecting from charger.
If the device enter to suspend, the device couldn't handle the power off
process. So the device shouldn't suspend to handle the power off at that time

Bug: 7429504
Change-Id: I9a0a60e53f315cd83550dc730a33bc7bd464ef67
2013-01-22 16:10:57 -08:00
choongryeol.lee dec27f6e11 charger: suspend enable in charger mode
To reduce power consumption after charging completion, enable suspend when LCD
is turned off.

Bug: 7429504
Change-Id: I34731dc392661c9051a20cea74f70d94a8aaeb42
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-01-22 16:06:02 -08:00
Iliyan Malchev fdf2f33780 libsuspend: compile as a static library
Compile libsuspend as a static library as well, currently needed by the charger
code in some cases.

Related-to-bug: 7429504
Change-Id: I113017c2c855f915b77c76d8934b6e57c0bb532c
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-01-22 16:00:05 -08:00
David Turner 3dbcb6d6c6 am 98d07897: Merge "Windows adb: Make client stdout and stderr handles uninheritable"
* commit '98d0789772b94b9b0c2aecfab74dc1a9283a91b1':
  Windows adb: Make client stdout and stderr handles uninheritable
2013-01-21 02:51:40 -08:00
David Turner 98d0789772 Merge "Windows adb: Make client stdout and stderr handles uninheritable" 2013-01-21 10:16:54 +00:00
Elliott Hughes 989c033bf3 am 026b3953: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
* commit '026b3953d4471cd43c850ee72bbca7cc77e87a34':
  The localtime_tz and mktime_tz extensions are now in bionic.
2013-01-15 14:33:22 -08:00
Elliott Hughes 026b3953d4 Merge "The localtime_tz and mktime_tz extensions are now in bionic." 2013-01-15 13:21:55 -08:00
Elliott Hughes def8d6a706 The localtime_tz and mktime_tz extensions are now in bionic.
(cherry-pick of d03072ffde. This change
was originally committed to AOSP, is in internal master, but was somehow
lost from AOSP.)

Bug: 7012465

Conflicts:

	libcutils/Android.mk

Change-Id: I08ee8eb9b8ce5d3f9d8f2e67437d653e08697bc1
2013-01-15 11:34:08 -08:00
Ray Donnelly bbe26c1f79 Windows adb: initialize on to 1 in disable_tcp_nagle 2013-01-11 16:36:00 +00:00
Ray Donnelly cbb9891049 Windows adb: include stdint.h for uint8_t on MinGW-w64
Change-Id: I84b8284bc034feb0acd313b0aad9e2fa5868854f
2013-01-08 23:11:49 +00:00
Ray Donnelly 267aa8b00e Windows adb: Make client stdout and stderr handles uninheritable
Change-Id: Ib0519a199c9504aad1d0ecc3757f4d162984bf22
2013-01-08 23:02:28 +00:00
Ying Wang f62f1e3a07 am ef2ea99b: Merge "Correct LOCAL_LDLIBS of adb"
* commit 'ef2ea99bfe1e19c451882c3c8eb19368d0087ff6':
  Correct LOCAL_LDLIBS of adb
2013-01-08 15:00:41 -08:00
Ying Wang ef2ea99bfe Merge "Correct LOCAL_LDLIBS of adb" 2013-01-08 13:56:07 -08:00
Elliott Hughes bab2ba3e73 am 6d9589c3: Merge "Fix dhcpcd startup when net.hostname is not set"
* commit '6d9589c33517c024ab992d1e2c1b8efd1b51e366':
  Fix dhcpcd startup when net.hostname is not set
2013-01-07 12:18:35 -08:00