Commit graph

4848 commits

Author SHA1 Message Date
Ben Cheng
26f447f5da am 7f692fe6: am 523e21d3: Merge "Fail-proof the inline directives for SMP atomic operations."
* commit '7f692fe6448049dca2795d7d648615a2dc7a500c':
  Fail-proof the inline directives for SMP atomic operations.
2012-12-07 14:37:04 -08:00
Ben Cheng
7f692fe644 am 523e21d3: Merge "Fail-proof the inline directives for SMP atomic operations."
* commit '523e21d366523604576b85960d7aba6062fd5605':
  Fail-proof the inline directives for SMP atomic operations.
2012-12-07 14:35:24 -08:00
Ben Cheng
523e21d366 Merge "Fail-proof the inline directives for SMP atomic operations." 2012-12-07 13:32:28 -08:00
Devin Kim
20eaebeebe am deb8e39e: am e1f0bd83: am fd8e6504: charger: Do not suspend when disconnecting from charger
* commit 'deb8e39ede561efa40e05e9ccd67c7704a75e8ce':
  charger: Do not suspend when disconnecting from charger
2012-12-07 12:13:52 -08:00
Devin Kim
deb8e39ede am e1f0bd83: am fd8e6504: charger: Do not suspend when disconnecting from charger
* commit 'e1f0bd83244e1ac96c6b023cfe12286cda8571c1':
  charger: Do not suspend when disconnecting from charger
2012-12-07 12:11:37 -08:00
Devin Kim
e1f0bd8324 am fd8e6504: charger: Do not suspend when disconnecting from charger
* commit 'fd8e6504e355d2c73a2aaad260475f72af0495bf':
  charger: Do not suspend when disconnecting from charger
2012-12-07 12:09:57 -08:00
Ben Cheng
5206d59712 Fail-proof the inline directives for SMP atomic operations.
The various atomic operations are declared as inline in the header files
to cut the function call overhead. However, the plain inline keyword is
just a suggestion to the compiler which makes its own decision on whether
to inline them or not. Worst, if they are not inlined, the
-fvisibility-inlines-hidden compiler flag will render them as hidden
symbols in the object file. If they are picked up by the linker over the
ones supplied in libcutils.so the following warning will be reported:

warning: hidden symbol 'android_atomic_inc' in foo.o is referenced by
DSO bar.so

One way is to add __attribute__((visibility("default"))) to those inline
functions to suppress the linker warnings. A better way is to force
inlining as with this patch.

Change-Id: Ie4fcfdfaaf06f42d351619a0d89671a9df15ca2f
2012-12-07 11:07:10 -08:00
Devin Kim
fd8e6504e3 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
2012-12-07 10:13:51 -08:00
Iliyan Malchev
6cd2d30a9f am 9c6385e1: am 94dd6794: am 40156b8a: charger: fix build
* commit '9c6385e1ca965bdfd7b86f16571be085db50e5b9':
  charger: fix build
2012-12-06 23:23:44 -08:00
choongryeol.lee
c37f51c0c4 am 86d08f0b: am 12b26649: am 9255713b: charger: suspend enable in charger mode
* commit '86d08f0b3f8d29c4789fdfc55f70747f0b35ff88':
  charger: suspend enable in charger mode
2012-12-06 23:23:43 -08:00
Benoit Goby
4aaf198deb am 9e2182ad: am 6d3e6099: am a2411eed: Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev
* commit '9e2182adc2f91ed3a5e7713ce214aafb537fab43':
  init.usb.rc: set sys.usb.config to none before changing it
2012-12-06 23:23:42 -08:00
Iliyan Malchev
500ff199d2 am f3104fe5: am 76edb14f: am 2cc3527a: libsuspend: compile as a static library
* commit 'f3104fe5ce438edb652fbe3aa32f8be6359a4aad':
  libsuspend: compile as a static library
2012-12-06 23:23:41 -08:00
Iliyan Malchev
9c6385e1ca am 94dd6794: am 40156b8a: charger: fix build
* commit '94dd67946e56186caddbdead53f4e2e3824d8eaa':
  charger: fix build
2012-12-06 19:00:53 -08:00
choongryeol.lee
86d08f0b3f am 12b26649: am 9255713b: charger: suspend enable in charger mode
* commit '12b26649a20c9cee0c613cd5bdc0923536aec2e3':
  charger: suspend enable in charger mode
2012-12-06 19:00:44 -08:00
Benoit Goby
9e2182adc2 am 6d3e6099: am a2411eed: Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev
* commit '6d3e6099770c9f78264f573897a8b1923edbee63':
  init.usb.rc: set sys.usb.config to none before changing it
2012-12-06 19:00:23 -08:00
Iliyan Malchev
f3104fe5ce am 76edb14f: am 2cc3527a: libsuspend: compile as a static library
* commit '76edb14f94069b11f36250390556d7c3c1853026':
  libsuspend: compile as a static library
2012-12-06 18:59:59 -08:00
Iliyan Malchev
94dd67946e am 40156b8a: charger: fix build
* commit '40156b8a91363da69675e7e4cb7947c371871654':
  charger: fix build
2012-12-06 17:11:00 -08:00
Iliyan Malchev
40156b8a91 charger: fix build
Looks like libsuspend is not available on all platforms.

Change-Id: Ic32dc93221f3c488e846da35235f247f4ddb4c69
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-12-06 17:06:39 -08:00
choongryeol.lee
12b26649a2 am 9255713b: charger: suspend enable in charger mode
* commit '9255713bcf929e7cdd2817481f0dd08f838285c3':
  charger: suspend enable in charger mode
2012-12-06 15:52:41 -08:00
choongryeol.lee
9255713bcf 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>
2012-12-06 15:48:52 -08:00
Irfan Sheriff
629ba3795d Merge "Remove dead code" 2012-12-06 13:16:57 -08:00
Irfan Sheriff
35c625194b Remove dead code
Remove unnecessary DHCP properties

Change-Id: I27b5d0a2d8fd67c911d04bb2d18dc1b3f10e7c2a
2012-12-06 12:08:05 -08:00
Benoit Goby
6d3e609977 am a2411eed: Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev
* commit 'a2411eedb2f005e344e7d920715727e136a806aa':
  init.usb.rc: set sys.usb.config to none before changing it
2012-12-06 12:02:12 -08:00
Benoit Goby
a2411eedb2 Merge "init.usb.rc: set sys.usb.config to none before changing it" into jb-mr1.1-dev 2012-12-06 11:59:54 -08:00
Iliyan Malchev
76edb14f94 am 2cc3527a: libsuspend: compile as a static library
* commit '2cc3527ae70138cc8a40d9ad6e92b98d81e44701':
  libsuspend: compile as a static library
2012-12-06 09:49:35 -08:00
Scott Anderson
9bfecb0e34 Add old fastboot_protocol.txt
fastboot_protocol.txt used to live in bootable/bootloader/legacy
which was old, obsolete code.  However, fastboot_protocol.txt is
a useful file and belongs with the fastboot code.

Change-Id: Iea50c3219f9ff9dd0c394fc6028c456fa948ffd9
Signed-off-by: Scott Anderson <saa@android.com>
2012-12-06 09:34:34 -08:00
Benoit Goby
80828af3de init.usb.rc: set sys.usb.config to none before changing it
On encrypted devices, persistent properties are loaded after the device
is decrypted. To properly change sys.usb.config to its persistent value,
it must first be set to "none" and then to ${persist.sys.usb.config}.

Bug: 7678835
Change-Id: I4f91245cedc04e3178ce9cee21390f5b657733c9
2012-12-05 18:04:01 -08:00
Iliyan Malchev
2cc3527ae7 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>
2012-12-05 16:03:34 -08:00
Alex Ray
59836bd243 Merge "cutils: trace: use ANDROID_SMP to switch atomics" 2012-12-04 11:29:52 -08:00
Elliott Hughes
229d2ace9d am b8db1e09: am 777991d9: Merge "Fixed improper size displaying in \'df\' utility"
* commit 'b8db1e093d412f57263dc597dbac14c377945781':
  Fixed improper size displaying in 'df' utility
2012-12-03 08:15:25 -08:00
Elliott Hughes
b8db1e093d am 777991d9: Merge "Fixed improper size displaying in \'df\' utility"
* commit '777991d9399f1268d27c72a03d56c1a36068a57f':
  Fixed improper size displaying in 'df' utility
2012-12-03 08:13:11 -08:00
Elliott Hughes
777991d939 Merge "Fixed improper size displaying in 'df' utility" 2012-12-03 07:33:38 -08:00
Colin Cross
376448c032 am e4e1a065: am 2a2f6408: Merge "autosuspend_inited flag set even if initialization fails"
* commit 'e4e1a065d943db4f770d12ca5734b9b9257fe78a':
  autosuspend_inited flag set even if initialization fails
2012-12-01 20:41:06 -08:00
Colin Cross
e4e1a065d9 am 2a2f6408: Merge "autosuspend_inited flag set even if initialization fails"
* commit '2a2f640886c9d356de1407b0888507823a7663b7':
  autosuspend_inited flag set even if initialization fails
2012-12-01 20:39:21 -08:00
Colin Cross
2a2f640886 Merge "autosuspend_inited flag set even if initialization fails" 2012-12-01 20:02:34 -08:00
Alex Ray
448f76a1c4 cutils: trace: use ANDROID_SMP to switch atomics
With inline atomics, trace functions have no non-inline function calls
in the fast (tracing off) path.  To enable this, ANDROID_SMP must be
defined for the project.  Otherwise, normal (non-inline) atomics are
used.

Change-Id: Id1f75bdf7db2f5d319a389ad411f55073d78c48c
2012-11-30 19:40:58 -08:00
Wink Saville
eb35fdff92 Merge "Use Rlog instead of Log" 2012-11-30 13:45:00 -08:00
Alex Ray
3fc2b89abf Merge "cutils: trace: add atrace_update_tags()" 2012-11-28 14:19:54 -08:00
Alex Ray
3b5c925599 Merge "cutils: Add tracing support" 2012-11-28 14:06:57 -08:00
Alex Ray
e7bb7bca4f cutils: trace: add atrace_update_tags()
Adds a function to read the current trace system property value, and
sets the trace tags to it, do be used as a sysprop change callback.

Change-Id: Ia6336652173aa5b07188898736c2c795a69fe79a
2012-11-28 13:56:49 -08:00
Alex Ray
0a34643160 cutils: Add tracing support
Basic tracing functionality to cutils, which can be turned on at start,
or dynamically controlled by the frameworks.  The goal is for hardware
modules to add tracing that will be controlled by their respective
services.

Change-Id: I84eeb7d6be0038f734e719074fa4a2fae4ffe9c0
2012-11-28 13:56:15 -08:00
Wink Saville
91b114669f Use Rlog instead of Log
Changing __android_log_write so the tag warns users relying on the
tag to direct log output to the radio buffer to instead use Rlog or RLOG.

Change-Id: I04b7bb5e620c1ab22b9b495382a252b539947e28
2012-11-28 12:20:19 -08:00
Kenny Root
b2cf68fd57 am 34ee8252: am a649fafb: Merge "Switch keystore to binder"
* commit '34ee8252caa1ede3b1ba41b49673c90e3a500459':
  Switch keystore to binder
2012-11-27 17:34:28 -08:00
Kenny Root
7af628233e am 27888a5d: am 9b82ce20: Merge "Document the SELinux extensions to the Android init language."
* commit '27888a5ded21182e1f15b19010fd2527fb7e1ef0':
  Document the SELinux extensions to the Android init language.
2012-11-27 17:34:27 -08:00
Kenny Root
34ee8252ca am a649fafb: Merge "Switch keystore to binder"
* commit 'a649fafbe8a83e9b86ea99f89b6554d93eb1937c':
  Switch keystore to binder
2012-11-27 11:55:16 -08:00
Kenny Root
27888a5ded am 9b82ce20: Merge "Document the SELinux extensions to the Android init language."
* commit '9b82ce20ebca3eb5bf782c38ca36d8acbb2ffae6':
  Document the SELinux extensions to the Android init language.
2012-11-27 11:55:13 -08:00
Kenny Root
a649fafbe8 Merge "Switch keystore to binder" 2012-11-27 11:20:55 -08:00
Kenny Root
9b82ce20eb Merge "Document the SELinux extensions to the Android init language." 2012-11-27 11:20:38 -08:00
Wink Saville
22f625529e Merge "Add RLOGx" 2012-11-26 08:33:11 -08:00
Kyle Russell
a26b4caf4c autosuspend_inited flag set even if initialization fails
Prevents possible SIGSEGV on second autosuspend_enable attempt when
first intialization attempt fails.  autosuspend_inited should only
be set once autosuspend_ops has been assigned.

Consider the first call to autosuspend_enable().
autosuspend_init() sets its inited flag to true, and attempts to
set autosuspend_ops.  If all the other autosuspend_*_init() attempts
fail, autosuspend_init() returns -1, which autosuspend_enable()
will return as a failure.  A second call to autosuspend_enable()
will check autosuspend_init() and see that autosuspend has already
been initialized.  It will attempt to access autosuspend_ops, which
were not set in the first initialization attempt, causing a SIGSEGV.

Change-Id: Ib2d3ee62fee4c3b6d0323e5b7f3709a23c6b923f
2012-11-20 09:12:39 -05:00