Irfan Sheriff
35c625194b
Remove dead code
...
Remove unnecessary DHCP properties
Change-Id: I27b5d0a2d8fd67c911d04bb2d18dc1b3f10e7c2a
2012-12-06 12:08:05 -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
Robert Greenwalt
3e3a97dcf3
Merge "Read domain name from dhcp system prop"
2012-11-16 12:56:18 -08:00
Wink Saville
44a9abdd04
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-11-16 12:46:08 -08:00
Kenny Root
92781808ba
Switch keystore to binder
...
Change-Id: I1607bc1f14af5115cefd6727be3815cdcce670a8
2012-11-13 12:19:47 -08:00
Robert Greenwalt
6ecbdca4c1
Read domain name from dhcp system prop
...
This property is set by the dhcpcd daemon.
bug:6799630
Change-Id: I21002e286819cff420ec72e3857764e5f58ecfe4
2012-11-13 12:04:09 -08:00
jp abgrall
3699bcfe83
am 0069b013
: am 3ddc0059
: am ee854b07
: Merge "Allocate a UID for clatd"
...
* commit '0069b01354ab9a62acaf4547f78688429274f0ef':
Allocate a UID for clatd
2012-11-12 16:02:00 -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
2832525e70
am 1626b98c
: am 7fd51b36
: am b20fa762
: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev
...
* commit '1626b98c5b1d4755f0f146698d487732dcc0a2cc':
Fix fs_mgr to properly invoke e2fsck on encrypted devices
2012-11-12 11:52:14 -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
258a0a5ac1
am 1ca4b7d2
: (-s ours) am 270ee0c6
: am ba70ed9a
: Reconcile with jb-mr1-release - do not merge
...
* commit '1ca4b7d26a46d7b779a687f43f2c30ea779693de':
2012-11-08 06:31:43 -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
846c686b66
am 493d04d2
: am f621d62a
: am c4244565
: am d1e39491
: Add usb vendor id for Teleepoch.
...
* commit '493d04d2fec59b273a067f5ef9d908dd0b441a08':
Add usb vendor id for Teleepoch.
2012-11-08 06:21:12 -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
Xavier Ducrohet
f621d62adc
am c4244565
: am d1e39491
: Add usb vendor id for Teleepoch.
...
* commit 'c424456542cacc7d776e1adc859ed1c0e784dee0':
Add usb vendor id for Teleepoch.
2012-11-06 17:10:14 -08:00
Xavier Ducrohet
c424456542
am d1e39491
: Add usb vendor id for Teleepoch.
...
* commit 'd1e39491f063626e026304ba8abe084cc43c94da':
Add usb vendor id for Teleepoch.
2012-11-06 17:07:54 -08:00
Xavier Ducrohet
d1e39491f0
Add usb vendor id for Teleepoch.
...
Change-Id: I82bbfed598fc3a886681c4139600cf487034c59c
2012-11-06 12:56:14 -08:00
The Android Open Source Project
770dd86a75
am 63766a89
: (-s ours) am b64246ae
: am c8e3a27b
: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '63766a89a18e8476f6e4cbac505a2a827d0490ab':
2012-11-06 12:31:12 -08:00
The Android Open Source Project
63766a89a1
am b64246ae
: am c8e3a27b
: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'b64246ae1b00eacd5323f8a8db7249bd726c4f33':
2012-11-06 12:27:06 -08:00
The Android Open Source Project
b64246ae1b
am c8e3a27b
: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'c8e3a27b43407268b2bb76b1d4fceee4fa3b314a':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
Dump 256 bytes per chunk pointed by general-purpose registers.
Wrap system calls in TEMP_FAILURE_RETRY.
Bring back ADB_EXTERNAL_STORAGE.
Revert "Upgrade to dlmalloc 2.8.5."
bluetooth: bring up with bluedroid stack
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
2012-11-06 12:23:39 -08:00
The Android Open Source Project
c8e3a27b43
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I89230f756ce6caee4d7fa4514f47b6b0fc44d1f3
2012-11-06 12:19:18 -08:00