Rom Lemarchand
d2674cbad9
am 0a04c556: am 19759a08: Merge "audio: fix audio_is_bluetooth_sco_device()"
...
* commit '0a04c556947e4fb8e12cd73b9aded27318002336':
audio: fix audio_is_bluetooth_sco_device()
2014-04-24 22:21:39 +00:00
Rom Lemarchand
0a04c55694
am 19759a08: Merge "audio: fix audio_is_bluetooth_sco_device()"
...
* commit '19759a08053e18bc8efc4aa73f9a0cb8a88608fb':
audio: fix audio_is_bluetooth_sco_device()
2014-04-24 22:18:39 +00:00
Rom Lemarchand
19759a0805
Merge "audio: fix audio_is_bluetooth_sco_device()"
2014-04-24 22:14:13 +00:00
Eric Laurent
b526630ab8
audio: fix audio_is_bluetooth_sco_device()
...
Bug: 14268964
Change-Id: Ia2a185c5e0939930c5114209651a1e0db6c36ef3
2014-04-24 22:03:00 +00:00
Elliott Hughes
6d7a2ee4e8
am b1bcd9c3: am 6798914b: Merge "Improve liblog\'s fatal logging."
...
* commit 'b1bcd9c3ae89f9060fcd8468d5a04f3710e2b1a6':
Improve liblog's fatal logging.
2014-04-24 20:47:00 +00:00
Elliott Hughes
b1bcd9c3ae
am 6798914b: Merge "Improve liblog\'s fatal logging."
...
* commit '6798914b6fc93d6a9964129b734ec7d7be88d99b':
Improve liblog's fatal logging.
2014-04-24 20:35:43 +00:00
Elliott Hughes
6798914b6f
Merge "Improve liblog's fatal logging."
2014-04-24 20:33:59 +00:00
Elliott Hughes
da6b2e2fd7
Improve liblog's fatal logging.
...
This makes LOG_ALWAYS_FATAL and LOG_ALWAYS_FATAL_IF as good as regular
assert(3).
Change-Id: I0666684d30cae7baf23c64b33d35c1e43f81acf0
2014-04-24 13:28:24 -07:00
Mark Salyzyn
afee47e770
am 35b55649: am 0607e104: Merge "liblog: Statistics truncated to 16384 bytes"
...
* commit '35b55649feabd91c68f7ed6a22f30af046099b27':
liblog: Statistics truncated to 16384 bytes
2014-04-22 21:15:12 +00:00
Mark Salyzyn
35b55649fe
am 0607e104: Merge "liblog: Statistics truncated to 16384 bytes"
...
* commit '0607e104c2db2a3e115fd9b49ea85cbc03dbcd1f':
liblog: Statistics truncated to 16384 bytes
2014-04-22 19:52:15 +00:00
Mark Salyzyn
0607e104c2
Merge "liblog: Statistics truncated to 16384 bytes"
2014-04-22 19:15:00 +00:00
Christopher Ferris
3af88bc637
am e87dab14: am 07fa0433: Merge "Remove the arm64 special case."
...
* commit 'e87dab14ee2914308b96488c8a2b1d22a25473aa':
Remove the arm64 special case.
2014-04-22 13:32:02 +00:00
Christopher Ferris
e87dab14ee
am 07fa0433: Merge "Remove the arm64 special case."
...
* commit '07fa043341ad057ea79ca973089609965ba6c4f9':
Remove the arm64 special case.
2014-04-22 13:18:57 +00:00
Christopher Ferris
07fa043341
Merge "Remove the arm64 special case."
2014-04-22 01:47:12 +00:00
Christopher Ferris
04fd4389fb
Remove the arm64 special case.
...
The stack-protector option is handled by the global makefiles.
Change-Id: I99c4a1624e72ad91ac10eef27c0e3758fe9af8ba
2014-04-21 17:57:56 -07:00
Mark Salyzyn
696817d352
liblog: Statistics truncated to 16384 bytes
...
- if network read/write broken up, reassemble the pieces.
- Use a 20ms poll to check if a new fragment has been
sent by the other side.
- fixup logd-unit-tests to take a (simplified) fragment
from the liblog changes.
Bug: 14164765
Change-Id: I98ff87888c119e1e8349717646d0f733e8971bc8
2014-04-21 17:07:25 -07:00
Elliott Hughes
0888e52fa8
am afe5bbef: am a67914e4: Merge "Fix top(1) SIGPIPE behavior."
...
* commit 'afe5bbefac2cd09a2a2e46777f6bba7afa9c2966':
Fix top(1) SIGPIPE behavior.
2014-04-21 13:45:30 +00:00
Elliott Hughes
afe5bbefac
am a67914e4: Merge "Fix top(1) SIGPIPE behavior."
...
* commit 'a67914e4d656b8375cfba17739f9c97e900c8328':
Fix top(1) SIGPIPE behavior.
2014-04-21 13:35:23 +00:00
Elliott Hughes
a67914e4d6
Merge "Fix top(1) SIGPIPE behavior."
2014-04-19 00:19:00 +00:00
Elliott Hughes
5922d3b5be
Fix top(1) SIGPIPE behavior.
...
Bug: 14166609
Change-Id: I4aad1e0db2e875735405d094fb0d1a36862b5b19
2014-04-18 16:53:04 -07:00
Colin Cross
37d39eba0b
am 0cb82da2: am 958235bd: Merge "libsparse: allow including from C++"
...
* commit '0cb82da25475d30f8cddbf60764400f3040809ae':
libsparse: allow including from C++
2014-04-18 21:31:37 +00:00
Colin Cross
0cb82da254
am 958235bd: Merge "libsparse: allow including from C++"
...
* commit '958235bdc1d9d421cff24a8af415959ec5282c46':
libsparse: allow including from C++
2014-04-18 21:27:39 +00:00
Colin Cross
958235bdc1
Merge "libsparse: allow including from C++"
2014-04-18 21:22:54 +00:00
Colin Cross
099824cce3
libsparse: allow including from C++
...
Change-Id: I3788fd07e2b52430a410f85fb79dc886c6a07fea
2014-04-18 14:22:22 -07:00
JP Abgrall
46e6b4f7fd
am b0397d55: am 9bb44b41: Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"
...
* commit 'b0397d55a2ff4b3c6664c9545be18ba88c07dea4':
rootdir: init.rc: update max TCP window sizes for mobile networks
2014-04-18 21:15:33 +00:00
Colin Cross
4726ba2408
am 40d49a02: am e99e5474: Merge "Sync persist property immediately,in case of suddenly remove the battery."
...
* commit '40d49a02928e5b9a357915e0c73c764932a84f28':
Sync persist property immediately,in case of suddenly remove the battery.
2014-04-18 21:15:33 +00:00
JP Abgrall
b0397d55a2
am 9bb44b41: Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"
...
* commit '9bb44b41da7a9ef2e0c29ed9c0a41c06685f5127':
rootdir: init.rc: update max TCP window sizes for mobile networks
2014-04-18 21:12:34 +00:00
Colin Cross
40d49a0292
am e99e5474: Merge "Sync persist property immediately,in case of suddenly remove the battery."
...
* commit 'e99e5474e101034e2d6e095ebdca011cb62b9386':
Sync persist property immediately,in case of suddenly remove the battery.
2014-04-18 21:12:32 +00:00
JP Abgrall
9bb44b41da
Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"
2014-04-18 19:20:54 +00:00
Narayan Reddy
ce898489e4
rootdir: init.rc: update max TCP window sizes for mobile networks
...
GRPS: RTT=600ms, max tput=80kbps (class 12 GMSK 4+1)
EDGE: RTT=300ms, max tput=236kbps (class 12 8PSK)
UMTS: RTT=200ms, max tput=384kbps (R99)
HSDPA: RTT=75ms, max tput=14Mbps (cat 10)
HSUPA: RTT=50ms, max tput=14Mbps
HSPA: RTT=50ms, max tput=14Mbps
HSPA+: RTT=50ms, max tput=42Mbps (cat 20)
LTE: RTT=20ms, max tput=100Mbps (class 3)
bug 67569
Change-Id: I9d62359bbd11dc68e3649a7ea2295d0d4e25e3f2
Signed-off-by: Narayan Reddy <narayanr@nvidia.com>
Signed-off-by: Steve Lin <stlin@nvidia.com>
2014-04-18 19:19:44 +00:00
Colin Cross
e99e5474e1
Merge "Sync persist property immediately,in case of suddenly remove the battery."
2014-04-18 18:49:17 +00:00
Colin Cross
48858b21b2
am c33702dd: am 4785ea60: Merge "adb: Add USB vendor ID for Prestigio"
...
* commit 'c33702dd92da5f41d17ee9a64a8a0ff67f6e9d1b':
adb: Add USB vendor ID for Prestigio
2014-04-18 00:52:44 +00:00
Colin Cross
c33702dd92
am 4785ea60: Merge "adb: Add USB vendor ID for Prestigio"
...
* commit '4785ea6074b78f195711a9743c214fcc738c3709':
adb: Add USB vendor ID for Prestigio
2014-04-18 00:47:42 +00:00
Colin Cross
4785ea6074
Merge "adb: Add USB vendor ID for Prestigio"
2014-04-18 00:43:39 +00:00
Mark Salyzyn
f7770d59df
am 19697f3e: am 3ad0af6d: Merge "logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH"
...
* commit '19697f3e1eaf9c54b612e42f93619658194707cd':
logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH
2014-04-17 23:22:38 +00:00
Mark Salyzyn
4f7e54f32d
am fe545b9c: am 0516aded: Merge "logd: libsysutils: logd startup outside init environment"
...
* commit 'fe545b9cb7188036d5fe8c433c7c87dd1b364c2b':
logd: libsysutils: logd startup outside init environment
2014-04-17 23:22:37 +00:00
Mark Salyzyn
2898a4ad5e
am 7fb0ff53: am 25f07f77: Merge changes I487ebe67,Ie7a0aeb2
...
* commit '7fb0ff53e87115d98af7272368348bbc270516ae':
libutils: FileMap styling adjustments
libutils: FileMap 64 bit compile issues
2014-04-17 23:22:28 +00:00
Mark Salyzyn
19697f3e1e
am 3ad0af6d: Merge "logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH"
...
* commit '3ad0af6d0422b1659ad6912802693cffd45be3b9':
logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH
2014-04-17 23:16:39 +00:00
Mark Salyzyn
fe545b9cb7
am 0516aded: Merge "logd: libsysutils: logd startup outside init environment"
...
* commit '0516aded0e3006272ec390fd418d311e06b1d328':
logd: libsysutils: logd startup outside init environment
2014-04-17 23:16:38 +00:00
Mark Salyzyn
3ad0af6d04
Merge "logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH"
2014-04-17 23:12:10 +00:00
Mark Salyzyn
0516aded0e
Merge "logd: libsysutils: logd startup outside init environment"
2014-04-17 23:11:40 +00:00
Mark Salyzyn
7fb0ff53e8
am 25f07f77: Merge changes I487ebe67,Ie7a0aeb2
...
* commit '25f07f77eceba32a5085a6ff9b70081352d3fdb9':
libutils: FileMap styling adjustments
libutils: FileMap 64 bit compile issues
2014-04-17 20:52:30 +00:00
Mark Salyzyn
25f07f77ec
Merge changes I487ebe67,Ie7a0aeb2
...
* changes:
libutils: FileMap styling adjustments
libutils: FileMap 64 bit compile issues
2014-04-17 20:47:38 +00:00
Mark Salyzyn
270abd6944
am ca242b49: am 280b7d40: Merge "libutils: BlobCache 64 bit compile issues"
...
* commit 'ca242b497daa152f517f2b74037d5e2765f3ad2d':
libutils: BlobCache 64 bit compile issues
2014-04-17 17:07:44 +00:00
Mark Salyzyn
ca242b497d
am 280b7d40: Merge "libutils: BlobCache 64 bit compile issues"
...
* commit '280b7d40f5d0478bf92470f1d6b0bce917712dcc':
libutils: BlobCache 64 bit compile issues
2014-04-17 17:02:24 +00:00
Mark Salyzyn
b618576ff1
libutils: FileMap styling adjustments
...
Change-Id: I487ebe67a46a7b8f680e722141dd216bbd396f3e
2014-04-17 10:02:15 -07:00
Mark Salyzyn
15085a6a2c
libutils: FileMap 64 bit compile issues
...
Change-Id: Ie7a0aeb2a7e2d2a90aa2b97c657ea7ec566bf793
2014-04-17 09:43:36 -07:00
Mark Salyzyn
280b7d40f5
Merge "libutils: BlobCache 64 bit compile issues"
2014-04-17 16:42:32 +00:00
Mark Salyzyn
dfc47e8685
logd: libsysutils: logd startup outside init environment
...
Change-Id: I3426b6c3eebdd0c8258e966dcaaaa2825d7a23d1
2014-04-17 16:14:24 +00:00
Mark Salyzyn
387c561300
libutils: BlobCache 64 bit compile issues
...
Change-Id: I60e9bddfff04f19834b83bdc26a83ca7173363c3
2014-04-17 08:32:11 -07:00