Colin Cross
99c1a4168b
resolved conflicts for merge of 95a41f6b to stage-aosp-master
...
Change-Id: Icfae29edf989fb43a7f0b8bda188a9807f76a3b9
2013-06-17 18:19:28 -07:00
Colin Cross
1a6f4c3bf2
init: switch property_get to use __system_property_get
...
(cherry picked from commit 2deedfe0b1
2013-06-17 16:57:32 -07:00
Jeff Sharkey
b4d52a437e
Only handle keycodes when adb is enabled.
...
This prevents accidental bugreports on userdebug/eng devices.
Bug: 8541006
Change-Id: Iefd15826090fd91434403f197cfd166e64400224
2013-04-04 10:46:33 -07:00
Colin Cross
8bc6fb3433
am bf10797e: am f7ca6040: Fix infinite loop in init when debugging is turned off
...
* commit 'bf10797e538f9fa252d72710bd5ecf0ef1f6f3e0':
Fix infinite loop in init when debugging is turned off
2011-01-04 18:50:51 -08:00
Colin Cross
f7ca604061
Fix infinite loop in init when debugging is turned off
...
If a keychord is pressed when debugging is turned off, the main
event poll in init will return an event on the keychord fd,
but handle_keychord never reads the data. Once this happens,
the poll will always return immediately, and init enters an
infinite loop. Fix it by always reading from the keychord fd,
but only handling the returned keychord if debugging is
enabled.
Change-Id: Ie4efa98247d3cc978d275dc8a4516b32aa710278
2011-01-04 18:21:22 -08:00
Olivier Bailly
b93e5812fa
Add missing headers for compilation on x86 targets
...
Change-Id: I5f4dc797b353a0f01fa00d38375ec303bf863254
2010-11-17 11:47:23 -08:00
Colin Cross
ed8a7d8442
init: Move list and log handling to list.h and log.h
...
Change-Id: I298f575c590d0f28b7ad78747f3ebdbba56b7a27
2010-04-21 19:43:35 -07:00
Colin Cross
a866695ebe
init: Move keychords to keychords.c
...
Change-Id: I8fba9f5f73439a451fc961f8111612dff4fb5dfd
2010-04-13 22:46:44 -07:00
