Commit graph

4662 commits

Author SHA1 Message Date
Ben Cheng
37af40c46c am b0f8c70a: Merge "Fix ELF header parser bug."
* commit 'b0f8c70aa3ae2851dabb6a73debd2011ddf95bcb':
  Fix ELF header parser bug.
2012-12-10 21:43:55 -08:00
Ben Cheng
b0f8c70aa3 Merge "Fix ELF header parser bug." 2012-12-10 18:06:38 -08:00
Elliott Hughes
3de7fe9f40 am 5fb042dd: Merge "Expand crasher with a "thread-" prefix to crash on another thread."
* commit '5fb042dd3a04086c340801bc4fa0e3a0ed493e82':
  Expand crasher with a "thread-" prefix to crash on another thread.
2012-12-10 15:57:25 -08:00
Elliott Hughes
5fb042dd3a Merge "Expand crasher with a "thread-" prefix to crash on another thread." 2012-12-10 15:04:16 -08:00
Ben Cheng
0015a42942 Fix ELF header parser bug.
Program header size should be 32 instead of 40.

Bug: 7696928

Change-Id: I8298a030790e9c28e8e8a0d2ad4e9ef294708eb6
2012-12-10 14:53:03 -08:00
Elliott Hughes
aa4213057b Expand crasher with a "thread-" prefix to crash on another thread.
So "thread-nostack" runs the "nostack" code on a new thread, and
"thread-abort" runs the "abort" code on a new thread, and so on.

Bug: http://code.google.com/p/android/issues/detail?id=16672
Change-Id: I026a0e43eea147f1a7a74243846954599bcf4238
2012-12-10 14:15:42 -08:00
Elliott Hughes
435c223d48 am 5144fa28: Merge "Add missing signal codes to get_sigcode."
* commit '5144fa28c59825118c8f6e6bee832708f9748b89':
  Add missing signal codes to get_sigcode.
2012-12-10 11:41:31 -08:00
Elliott Hughes
5144fa28c5 Merge "Add missing signal codes to get_sigcode." 2012-12-10 11:18:37 -08:00
Elliott Hughes
8f7d4430f3 Add missing signal codes to get_sigcode.
The only common one we were missing is SI_TKILL, but we've had the full
set on the dalvik-dev branch for some time now.

Change-Id: I7cf52d352b8624e0adb17a2ed440e7a10f490dfd
2012-12-10 10:35:11 -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
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
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
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
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
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
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
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
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
Kenny Root
92781808ba Switch keystore to binder
Change-Id: I1607bc1f14af5115cefd6727be3815cdcce670a8
2012-11-13 12:19:47 -08:00
jp abgrall
0069b01354 am 3ddc0059: am ee854b07: Merge "Allocate a UID for clatd"
* commit '3ddc0059bb897c4d7d2e0c6d9812d590388480d1':
  Allocate a UID for clatd
2012-11-12 15:58:57 -08:00
jp abgrall
3ddc0059bb am ee854b07: Merge "Allocate a UID for clatd"
* commit 'ee854b077766a85279fa1849b537c50837d1a204':
  Allocate a UID for clatd
2012-11-12 15:57:02 -08:00
jp abgrall
ee854b0777 Merge "Allocate a UID for clatd" 2012-11-12 14:49:50 -08:00
Ken Sumrall
1626b98c5b am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev
* commit '7fd51b36dabedee4de159213237e71ba20865812':
  Fix fs_mgr to properly invoke e2fsck on encrypted devices
2012-11-12 11:50:22 -08:00
Ken Sumrall
7fd51b36da am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev
* commit 'b20fa762b515b5e96c158959d8c8d0c2ff1bf46b':
  Fix fs_mgr to properly invoke e2fsck on encrypted devices
2012-11-12 11:48:01 -08:00
Ken Sumrall
b20fa762b5 Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev 2012-11-12 11:45:33 -08:00
The Android Open Source Project
1ca4b7d26a am 270ee0c6: am ba70ed9a: Reconcile with jb-mr1-release - do not merge
* commit '270ee0c6c62e1bcf278892094653e7ab008b3685':
2012-11-08 06:27:03 -08:00
Xavier Ducrohet
493d04d2fe am f621d62a: am c4244565: am d1e39491: Add usb vendor id for Teleepoch.
* commit 'f621d62adcbcd81d6479223d9afe47c1d966710d':
  Add usb vendor id for Teleepoch.
2012-11-08 06:14:18 -08:00
The Android Open Source Project
270ee0c6c6 am ba70ed9a: Reconcile with jb-mr1-release - do not merge
* commit 'ba70ed9ae7dab75bde317a8dc8886da309831eca':
2012-11-07 10:24:18 -08:00
The Android Open Source Project
ba70ed9ae7 Reconcile with jb-mr1-release - do not merge
Change-Id: I70866c059c12fdba45761ecbbb6e2a4cf2aa8107
2012-11-07 10:20:22 -08:00
The Android Automerger
31da9db0d1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 18:04:30 -08:00
Ken Sumrall
d42d327c17 Fix fs_mgr to properly invoke e2fsck on encrypted devices
Change-Id: Ie220f5cb7b614a48ec8afe66f4721ede3a368166
2012-11-06 17:55:37 -08:00