Commit graph

5029 commits

Author SHA1 Message Date
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
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
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
0060935e1d am 8cc97302: resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aosp
# Via Doug Zongker
* commit '8cc97302b2cc42d70af3c6d84a6a46984a09fe24':
  add AID_LOOP_RADIO for control of loop radio device
2013-01-29 11:06:39 -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
f61fb576e6 am db9697b3: am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."
# Via Android Git Automerger (1) and others
* commit 'db9697b3b059469153e81bf9e8844fb8e23149ea':
  libcorkscrew will always HAVE_DLADDR.
2013-01-29 10:35:38 -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
Wink Saville
38a260547b Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip" 2013-01-29 03:10:58 +00:00
Benoit Goby
280760853f Merge "Revert "init.usb.rc: set sys.usb.config to none before changing it"" 2013-01-29 02:50:44 +00:00
Rom Lemarchand
d0a21b2406 Merge "logwrap: add quiet flag to logwrap()" 2013-01-29 00:31:16 +00:00
Benoit Goby
8e85644aa1 Merge "adb: Add "unauthorized" connection state" 2013-01-29 00:17:43 +00:00
Rom Lemarchand
f5200c0750 logwrap: add quiet flag to logwrap()
Add a quiet flag to the logwrap function that prevents messages from
getting logged.

Change-Id: Ic56c011fb608babae32b03900b955833a6bdd070
2013-01-28 16:14:20 -08:00
Rom Lemarchand
2c3b2e12c1 Merge "logwrap: Replace sigprocmask with pthread_sigmask" 2013-01-29 00:13:25 +00:00
Rom Lemarchand
665118f502 Merge "logwrap: wait for child process when receiving SIGINT or SIGQUIT" 2013-01-29 00:12:11 +00:00
Rom Lemarchand
ed179d2f98 logwrap: Replace sigprocmask with pthread_sigmask
sigprocmask has undefined behavior when called from a thread.
Replacing with pthread_sigmask to ensure correct behavior if
logwrap() gets called from a thread.

Change-Id: I77b6959d345eac8d7b90039ed8144ead8c19a00c
2013-01-29 00:05:24 +00:00
Rom Lemarchand
75c289aab9 logwrap: wait for child process when receiving SIGINT or SIGQUIT
- Wait for the child to exit before propagating SIGINT and SIGQUIT
to the parent
- Add ignore_int_quit argument to logwrap() that gives the caller the
option to ignore SIGINT and SIGQUIT while logwrap is running

Change-Id: If5c96cf23094917211310f00aa6aed515f110f5b
2013-01-29 00:04:50 +00:00
Rom Lemarchand
99e1966400 logwrap: ensure child exits with _exit
Always exit the child process with _exit() rather than exit() to ensure none
of the parent's atexit functions get called if the child needs to exit before
calling exec.

Change-Id: I6a75111ef1bb3468c114c98743565471cf82c9dd
2013-01-28 15:44:24 -08:00
Benoit Goby
83dee8e4e5 Merge "adb: Read secure adb keys on every auth request" 2013-01-28 23:33:28 +00:00
Wink Saville
c0d399df69 Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
Add voip-common to BOOTCLASSPATH

Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
2013-01-28 15:28:20 -08:00
Rom Lemarchand
078ca5e30d Merge "logwrap: remove unnecessary call to setuid/setgid" 2013-01-28 23:23:53 +00:00
Rom Lemarchand
e74313baf8 Merge "logwrap: fix off by 1 argument error" 2013-01-28 23:23:40 +00:00
Rom Lemarchand
45509f9fdd Merge "logwrapper: switch to signal handlers for SIGCHLD" 2013-01-28 23:22:55 +00:00
Nick Kralevich
d11fb12019 Merge "property_service: make /dev/__properties__ readable" 2013-01-28 22:50:52 +00:00
Rom Lemarchand
cfb5ec3c28 logwrap: remove unnecessary call to setuid/setgid
Android allows all users to write to log.
The setuid/setgid call is unneeded and could cause unintended
side effects when called from daemons or programs that need
to run as root.

Change-Id: I3bdb26eaa4363ef037615e45a1a5cb1ceb4088f3
2013-01-28 13:12:37 -08:00
Rom Lemarchand
611f5b4b93 logwrap: fix off by 1 argument error
Fix off by 1 argument parsing error in liblogwrap.

Change-Id: I79832ae338a71c445f9f616d780c577826874386
2013-01-28 13:11:32 -08:00