Nick Kralevich
cd072e94cf
am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'ba104fb7f1f0acad99a0d3a1cf7153aab57ea450':
Fix overflow in adb_client
2013-12-10 12:25:59 -08:00
Nick Kralevich
ba104fb7f1
am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'e975716e36c9ad6aa80be2b54ee2cc63eadbdc44':
Fix overflow in adb_client
2013-12-10 12:22:50 -08:00
Nick Kralevich
e975716e36
am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit '03d4eb29003a712c28733646588fafc8939fc1fe':
Fix overflow in adb_client
2013-12-10 12:20:08 -08:00
Nick Kralevich
03d4eb2900
am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'd63fb078aea697c536b19c03d29d4dde4ac087fc':
Fix overflow in adb_client
2013-12-10 12:17:45 -08:00
Nick Kralevich
d63fb078ae
am e89e09dd: Fix overflow in adb_client
...
* commit 'e89e09dd2b9b42184973e3ade291186a2737bced':
Fix overflow in adb_client
2013-12-10 12:14:44 -08:00
Nick Kralevich
e89e09dd2b
Fix overflow in adb_client
...
Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037
Credit: Joshua Drake
Bug: 12060953
2013-12-10 10:18:10 -08:00
Jean-Baptiste Queru
f909440149
am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '75f29709af6d053168402dd12cdf8b0a58b0c35e':
charger: Do not suspend when disconnecting from charger
charger: suspend enable in charger mode
libsuspend: compile as a static library
2013-03-11 13:00:54 -07:00
Jean-Baptiste Queru
75f29709af
am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '09b43645514669b3ff8181b0a111bc14576e3699':
charger: Do not suspend when disconnecting from charger
charger: suspend enable in charger mode
libsuspend: compile as a static library
2013-03-11 12:47:27 -07:00
Jean-Baptiste Queru
09b4364551
am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '92b2cd23f708c9aeed146e995807dce080b57d1a':
charger: Do not suspend when disconnecting from charger
charger: suspend enable in charger mode
libsuspend: compile as a static library
2013-03-11 12:28:11 -07:00
Jean-Baptiste Queru
92b2cd23f7
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:23:26 -07: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
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
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