Commit graph

4686 commits

Author SHA1 Message Date
Dima Zavin
7ec62dbd9d am 82ea44f8: Merge "Change setsebool syntax to be consistent with other init built-ins."
* commit '82ea44f88fed158fd807ef5b79100295b1163941':
  Change setsebool syntax to be consistent with other init built-ins.
2012-12-19 09:46:39 -08:00
Dima Zavin
82ea44f88f Merge "Change setsebool syntax to be consistent with other init built-ins." 2012-12-18 23:42:09 -08:00
Jean-Baptiste Queru
22e9136661 Merge from AOSP staging branch
Change-Id: I28f72f7c361eaa4a0fae671e988b52708cb9e3af
2012-12-18 15:18:00 -08:00
Mike Lockwood
516943c0e9 Merge "libusbhost: generates a static library" 2012-12-17 14:34:53 -08:00
Mike Lockwood
dea9a93ddd Merge "libusbhost: permits client polling on inotify wd" 2012-12-17 14:34:20 -08:00
David 'Digit' Turner
abf7cc977e am 13306d95: Merge "adb: Improve ADB\'s forward redirection management."
* commit '13306d95f6b70b58bfdd3e1c6d9b1d2a49e6f175':
  adb: Improve ADB's forward redirection management.
2012-12-13 18:08:58 -08:00
Stephen Smalley
0e23fee505 Change setsebool syntax to be consistent with other init built-ins.
Change setsebool syntax from name=value to name value.
This is to make it consistent with setprop and similar commands.
Update both the init built-in command and the toolbox command
for consistency.

Change-Id: I2c8e016ba26731c4a2ad4a49ae3b89362bf8f8a8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2012-12-13 15:41:53 -05:00
David 'Digit' Turner
13306d95f6 Merge "adb: Improve ADB's forward redirection management." 2012-12-13 03:40:24 -08:00
Wink Saville
0c47c68258 am 81077e5f: Merge "Use Rlog instead of Log"
* commit '81077e5faeaa064478495ce0924e8249b04899fd':
  Use Rlog instead of Log
2012-12-12 08:48:13 -08:00
Wink Saville
0c457c0fff am bf866aed: Merge "Add RLOGx"
* commit 'bf866aeda1d01a8adbcbf186f9ff08418e45b836':
  Add RLOGx
2012-12-12 08:48:12 -08:00
Wink Saville
81077e5fae Merge "Use Rlog instead of Log" 2012-12-12 08:23:15 -08:00
Wink Saville
bf866aeda1 Merge "Add RLOGx" 2012-12-12 08:22:02 -08:00
Robert Greenwalt
8bc848d9b2 am abce9e85: Merge "libsysutils: Increase command buffersize and command args"
* commit 'abce9e85e406b7a6e4c8c36b8eaaac049a7e11a9':
  libsysutils: Increase command buffersize and command args
2012-12-11 16:54:14 -08:00
Robert Greenwalt
abce9e85e4 Merge "libsysutils: Increase command buffersize and command args" 2012-12-11 15:50:50 -08:00
Ben Cheng
dc34f38312 am 2353a44e: am becea6e0: Merge "Fix ELF header parser bug." into jb-mr1.1-dev
* commit '2353a44eee2b97f9efca81103dac007db7129000':
  Fix ELF header parser bug.
2012-12-11 10:58:16 -08:00
Ben Cheng
2353a44eee am becea6e0: Merge "Fix ELF header parser bug." into jb-mr1.1-dev
* commit 'becea6e04e7f7cca3eaa514d5749d315c6213b25':
  Fix ELF header parser bug.
2012-12-11 10:56:32 -08:00
Ben Cheng
becea6e04e Merge "Fix ELF header parser bug." into jb-mr1.1-dev 2012-12-11 10:55:11 -08:00
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
c076030eaa Fix ELF header parser bug.
[cherry-picked from AOSP]
Program header size should be 32 instead of 40.

Bug: 7696928
Change-Id: I48e411837ff8a571544b55ccc37e20202dca424c
2012-12-10 20:49:43 -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
Guillaume Ranquet
08c119910a libusbhost: generates a static library
due to limitations of the droidboot OS used for POS,
there's a need for a static libusbhost library.

this permits to include libusbhost in droidboot

Change-Id: I0f0c07817ad19b773b466b69fd6e997877d41b34
Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com>
2012-12-10 11:12:44 +01:00
Guillaume Ranquet
dea46b6657 libusbhost: permits client polling on inotify wd
Modify libusbhost to expose the inotify watch descriptor to clients

This modification permits clients to add the watch descriptor to
their polling loop so that they don't have to use a dedicated
thread only for libusbhost.

Change-Id: I615bfcd56beab978135034b228d4d93337351eab
Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com>
Signed-off-by: Luc Piguet-Lacroix <lucx.piguet-lacroix@intel.com>
2012-12-10 11:12:35 +01: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
Wink Saville
3761e963b3 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-12-06 10:28:34 -08:00
Wink Saville
9d7ad45eff Add RLOGx
This will eventually allow us to remove the code in
logd_write.c#__android_log_write which uses the tag
to direct logs to the radio buffer.

Change-Id: Ic992c0b8d1cf000b1814dc7786d2a40becf75eaf
2012-12-06 10:20:27 -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