Commit graph

5057 commits

Author SHA1 Message Date
Nick Kralevich
c5ce4108fa am 1b64957a: Merge "init.rc: allow IPPROTO_ICMP support"
* commit '1b64957a7952738b02d437ffe3d4de45127a160c':
  init.rc: allow IPPROTO_ICMP support
2013-02-22 09:42:12 -08:00
Nick Kralevich
1b64957a79 Merge "init.rc: allow IPPROTO_ICMP support" 2013-02-22 16:33:46 +00:00
Nick Kralevich
be341cc348 init.rc: allow IPPROTO_ICMP support
Allow userspace programs to create IPPROTO_ICMP sockets.

This socket type allows an unprivileged program to safely
send ICMP_ECHO messages and receive the corresponding
ICMP_ECHOREPLY messages, without relying on raw sockets or
setuid programs.

Please see http://lwn.net/Articles/443051/ for details.

In particular, this allows us to use a version of ping
which doesn't have any capabilities
(https://android-review.googlesource.com/52072).
In addition, this allows us to safely implement an IPv4 ICMP
based version of InetAddress.isReachable()
(https://code.google.com/p/android/issues/detail?id=20106)

Change-Id: I876718151efa8219c4f34f573e35e21256fe2316
2013-02-21 19:28:13 -08:00
Nick Kralevich
e149855a81 am 523a2090: Merge "adb: Use 64 bit capabilities."
* commit '523a20901b2afce7ad02c0011d70ed57f8bbb997':
  adb: Use 64 bit capabilities.
2013-02-15 10:19:40 -08:00
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
910b7a8b88 am 17361134: Merge "Add a "smash-stack" option to crasher."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '17361134180b178531979897f9c9867346a57f10':
  Add a "smash-stack" option to crasher.
2013-02-14 16:16:26 -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
Igor Murashkin
1b69da3ef0 am 6711f76d: Merge "graphics.h: Remove unnecessary comments for Y8/Y16 formats" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and Igor Murashkin (1)
* commit '6711f76d244b22d8c39c33963d2d81504816eaf4':
  graphics.h: Remove unnecessary comments for Y8/Y16 formats
2013-02-11 11:48:38 -08:00
Igor Murashkin
6711f76d24 Merge "graphics.h: Remove unnecessary comments for Y8/Y16 formats" into jb-mr1-aah-dev 2013-02-11 19:46:22 +00:00
Igor Murashkin
d755b52b43 graphics.h: Remove unnecessary comments for Y8/Y16 formats
Change-Id: Ic80f6c4be7df9d9729334b97bb662eb2d0456c33
2013-02-11 11:34:53 -08:00
Igor Murashkin
fbb4a5ac1b am fba6c12a: Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and Igor Murashkin (1)
* commit 'fba6c12a3e6ac5fabe91270293b1115f72fd48a1':
  graphics.h: add new Y8, Y16 formats
2013-02-11 11:20:53 -08:00
Igor Murashkin
fba6c12a3e Merge "graphics.h: add new Y8, Y16 formats" into jb-mr1-aah-dev 2013-02-11 19:16:16 +00:00
Igor Murashkin
9e00e66ebc graphics.h: add new Y8, Y16 formats
Change-Id: I0cb3786d91f442b5f3b665dd78bf5f0dd4ae4cf0
2013-02-08 13:40:59 -08:00
Jeffrey Brown
4b9bdd3333 am 90dd1402: am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"
# By Duane Sand
# Via Android Git Automerger (1) and others
* commit '90dd14029414af26e64e3232f37c84feaa317ea8':
  [MIPS] Benchmark test for MIPS memset16/memset32
2013-02-06 20:57:06 -08:00
Jeffrey Brown
32fb9fed1e am 1b9a6057: am 44508515: Merge "Tidy up long lines"
# By Duane Sand
# Via Android Git Automerger (1) and others
* commit '1b9a60574028fd1dd77d6c07efb369ecaaf91218':
  Tidy up long lines
2013-02-06 20:57:05 -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
Jean-Baptiste Queru
719df3218b Reset to state of AOSP (i.e. MR1.1 + AOSP contributions). DO NOT MERGE. 2013-02-04 11:22:26 -08:00
Ian Rogers
2f228c3951 am 271d6dfb: (-s ours) am 78432ab1: Merge "Inline ldrex/strex for thumb2, remove ARMv5 remnants."
# Via Android Git Automerger (1) and others
* commit '271d6dfb9cfd3fee321ae14d43b067c97aa3a846':
  Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-02-01 17:44:32 -08: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
024f97c67b am 825f29b1: Merge from jb-mr1.1-dev
# Via Jean-Baptiste Queru
* commit '825f29b1c8f0c420af5dc6b05f0dbbd5b1ec36bf':
2013-02-01 15:41:57 -08:00
Jean-Baptiste Queru
825f29b1c8 Merge from jb-mr1.1-dev 2013-02-01 15:37:53 -08:00
Devin Kim
2b0c471ce0 am 693a3d6c: am 6a7a3245: am cf5c32c2: charger: Do not suspend when disconnecting from charger
# Via Android Git Automerger (2) and Iliyan Malchev (1)
* commit '693a3d6cd9658909f785d6dd179ba226fefec4a4':
  charger: Do not suspend when disconnecting from charger
2013-02-01 13:35:41 -08:00
choongryeol.lee
566cd8d165 am 83d16c9e: am 9190c0b3: am dec27f6e: (-s ours) charger: suspend enable in charger mode
# Via Android Git Automerger (2) and Iliyan Malchev (1)
* commit '83d16c9e47236aabac3cae05bde96c6fa2089cf8':
  charger: suspend enable in charger mode
2013-02-01 13:35:40 -08:00
Ed Heyl
823ce03898 am 2507aed4: reset to 016806a7, but keep bad history for fast forward
# By Rom Lemarchand (11) and others
# Via Android Git Automerger (194) and others
* commit '2507aed4300ffddfe0bd22843093ce66cf0a7b52': (48 commits)
  cutils: remove dead code.
  logwrap: add quiet flag to logwrap()
  logwrap: Replace sigprocmask with pthread_sigmask
  logwrap: wait for child process when receiving SIGINT or SIGQUIT
  logwrap: ensure child exits with _exit
  Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
  logwrap: remove unnecessary call to setuid/setgid
  logwrap: fix off by 1 argument error
  logwrapper: switch to signal handlers for SIGCHLD
  property_service: make /dev/__properties__ readable
  toolbox: renice: Add -t TYPE parameter and switch to getopt
  libsuspend: compile as a static library
  Revert "init: make system properties more secure."
  init: make system properties more secure.
  Revert "init.usb.rc: set sys.usb.config to none before changing it"
  adb: Add "unauthorized" connection state
  adb: Read secure adb keys on every auth request
  logwrapper: prevent logwrap from hanging when child dies
  logwrapper: split into liblogwrap and the executable itself
  cutils: add simple reference counter
  ...
2013-02-01 13:35:40 -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
693a3d6cd9 am 6a7a3245: am cf5c32c2: charger: Do not suspend when disconnecting from charger
# Via Android Git Automerger (1) and Iliyan Malchev (1)
* commit '6a7a324502e34e10830806751efbc514014815ee':
  charger: Do not suspend when disconnecting from charger
2013-02-01 10:58:06 -08:00
choongryeol.lee
83d16c9e47 am 9190c0b3: am dec27f6e: (-s ours) charger: suspend enable in charger mode
# Via Android Git Automerger (1) and Iliyan Malchev (1)
* commit '9190c0b3fdfdbcee98367c767dae0bd45f6ab08a':
  charger: suspend enable in charger mode
2013-02-01 10:58:05 -08: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
Ed Heyl
2507aed430 reset to 016806a7, but keep bad history for fast forward 2013-01-31 14:54:25 -08:00
Iliyan Malchev
749debe0ff am 085943a1: am fdf2f337: libsuspend: compile as a static library
# Via Android Git Automerger (1) and Iliyan Malchev (1)
* commit '085943a16cb3fdce91ff7345928afb1b259e2060':
  libsuspend: compile as a static library
2013-01-30 13:39:20 -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
49f0f77693 am 282caf3b: am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"
# By Ray Donnelly
# Via Android Git Automerger (2) and others
* commit '282caf3bd0dfd81b92ac74e0b3ea970d195fee7b':
  Windows adb: include stdint.h for uint8_t on MinGW-w64
2013-01-29 21:54:00 -08:00
Kenny Root
53e5b24231 am 6c3d3ccf: am d033739d: am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"
# By Ray Donnelly
# Via Android Git Automerger (2) and others
* commit '6c3d3ccfa5d1d77b80e5c7619909a48b976c69ec':
  Windows adb: initialize on to 1 in disable_tcp_nagle
2013-01-29 21:53:59 -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
Nick Kralevich
b94fd1abcb cutils: remove dead code.
The last caller of this code was removed in
dalvik commit eb1703442f3fc0577b3395b7eb4d55300b4125db
(https://android-review.googlesource.com/50689)

Change-Id: I3f4865c02092752a13369a3b2c3289fc9a4f6a62
2013-01-29 13:19:20 -08:00
Doug Zongker
3400ee257c am 76dd8e33: resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aosp
# Via Doug Zongker
* commit '76dd8e33689292e6255b090da7408fba76919424':
  change AID_LOOP_RADIO uid assignment
2013-01-29 11:12:12 -08:00