Mark Salyzyn
abc75368a8
am e70851f8: am f9b9693b: Merge "liblog: logcat: colored output."
...
* commit 'e70851f8a8aa4c9dfaa442abf812c283ba8d8b6f':
liblog: logcat: colored output.
2014-09-12 20:08:47 +00:00
Pierre Zurek
ead88fca6e
liblog: logcat: colored output.
...
This patch adds a new '-v color' option to logcat so that the output is
colored similar to the ones in DDMS. Simply type "adb logcat -v color"
to use it. Works well with bash in gnome-terminal. NO GUARANTEE IT WILL
WORK ON A NON xterm STYLE TERMINAL.
Signed-off-by: Michael Zimmermann <sigmaepsilon92@gmail.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I9189c5f27fed991579edbcbc6834536eb8112152
2014-09-11 19:04:17 -07:00
Jon Eklund
5c9f25da9c
am fcfa8640: audio.h: Add "safe speaker" device for limited-loudness use cases
...
* commit 'fcfa86403e206e2caa519299939480cb45deb8ba':
audio.h: Add "safe speaker" device for limited-loudness use cases
2014-09-11 18:30:51 +00:00
Jon Eklund
fcfa86403e
audio.h: Add "safe speaker" device for limited-loudness use cases
...
Bug: 17319721
Change-Id: Ie1af5b73258f8a0009c3bc3cecb3e0e8b2262ed7
2014-09-10 15:51:48 -07:00
Sreeram Ramachandran
18d5aa4d5a
am 69052994: Merge "Support resetting connections tied to any nonexistent address." into lmp-dev
...
* commit '69052994fd21f2b594295f62e2f867e911e8468d':
Support resetting connections tied to any nonexistent address.
2014-09-10 00:51:22 +00:00
Sreeram Ramachandran
69052994fd
Merge "Support resetting connections tied to any nonexistent address." into lmp-dev
2014-09-09 23:24:45 +00:00
Sreeram Ramachandran
17622d09d5
Support resetting connections tied to any nonexistent address.
...
Bug: 15414453
Change-Id: Ibf1f052e12b88838a328148e25817a96f10d50f5
2014-09-08 23:35:52 -07:00
Andreas Gampe
41df668c7b
NativeBridge: Refactor for new initialization flow
...
Setup becomes Load, have explicit Initialize and Unload.
(cherry picked from commit 035bd7541e )
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-08 11:12:13 -07:00
Andreas Gampe
4f65030e0c
am 8e10bfd9: am 88d1bc0e: Merge "NativeBridge: Refactor for new initialization flow"
...
* commit '8e10bfd9cc543fdec8fec26c320f649f72b15e3b':
NativeBridge: Refactor for new initialization flow
2014-09-04 23:22:29 +00:00
Andreas Gampe
035bd7541e
NativeBridge: Refactor for new initialization flow
...
Setup becomes Load, have explicit Initialize and Unload.
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-04 12:57:54 -07:00
Hans Boehm
cad56b6ad3
Remove android_... store_barriers and 64-bit atomics.
...
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses. All users should move
to C11 or C++11 atomics.
(Resolved conflicts in atomic-...64.h with uniprocessor support
removal as in AOSP.)
Bug:16880454
Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
(cherry picked from commit 9959ed9530 )
2014-09-02 17:08:38 -07:00
Brian Carlstrom
68e0d185f4
am 24d2adba: am 188d4396: Merge "Change /dalvik-cache to be owned by root."
...
* commit '24d2adba7a2f9caa82a88be70ad2fe7397ab310a':
Change /dalvik-cache to be owned by root.
2014-08-29 11:39:17 +00:00
Alex Light
c692410e16
Change /dalvik-cache to be owned by root.
...
Bug: 16875245
(cherry picked from commit 3878ebd724 )
Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-28 16:56:36 -07:00
Brian Carlstrom
188d4396b8
Merge "Change /dalvik-cache to be owned by root."
2014-08-28 23:17:06 +00:00
Alex Light
3878ebd724
Change /dalvik-cache to be owned by root.
...
Bug: 16875245
Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-27 15:42:19 -07:00
Hans Boehm
d034eb1171
am 424eaece: am 69001e08: Merge "Remove android_... store_barriers and 64-bit atomics."
...
* commit '424eaece64e3649082a3972a8eebf76a6b403494':
Remove android_... store_barriers and 64-bit atomics.
2014-08-27 22:09:03 +00:00
Hans Boehm
9959ed9530
Remove android_... store_barriers and 64-bit atomics.
...
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses. All users should move
to C11 or C++11 atomics.
Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
2014-08-27 14:15:09 -07:00
Andreas Gampe
049249ce7a
NativeBridge: Tighten security on libnativebridge
...
Do not allow arbitrary paths for the native bridge - only allow
simple names.
Do not allow re-setup of the native bridge.
Bug: 16404669
(cherry picked from commit cd2ef4c1af )
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-22 01:44:06 -07:00
Andreas Gampe
c029f9d225
am 4089cda0: Merge "NativeBridge: Tighten security on libnativebridge" into lmp-dev
...
* commit '4089cda0ae73e71adb787e595c747846e30730ee':
NativeBridge: Tighten security on libnativebridge
2014-08-22 05:13:50 +00:00
Andreas Gampe
cd2ef4c1af
NativeBridge: Tighten security on libnativebridge
...
Do not allow arbitrary paths for the native bridge - only allow
simple names.
Do not allow re-setup of the native bridge.
Bug: 16404669
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-21 14:33:44 -07:00
Elliott Hughes
176fe9005d
am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
...
* commit '4592d73e18684b8ba2addb97433eed4cf389e386':
Only the Mac doesn't have open_memstream.
2014-08-21 03:16:26 +00:00
Elliott Hughes
a59b6ac697
Merge "Only the Mac doesn't have open_memstream."
2014-08-21 00:11:41 +00:00
Elliott Hughes
3ff8888f66
Only the Mac doesn't have open_memstream.
...
We should probably move this into art, since they're the only people using it.
Bug: 17164505
Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
2014-08-20 16:16:24 -07:00
Elliott Hughes
3601abb810
am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."
...
* commit 'f7e88e51b31e64e085b3a564f4b1baa8334d63f1':
There's no non-SMP LP64.
2014-08-20 20:49:36 +00:00
Elliott Hughes
901c900ce6
There's no non-SMP LP64.
...
Bug: 17108682
Change-Id: I7e44ab48b5cacf989333882ffe67f39e9b0ce843
2014-08-20 13:05:55 -07:00
Elliott Hughes
10cce72c4b
am 3859029a: am 7fb0ee0c: Merge "Remove androidGetTid."
...
* commit '3859029a48aa78150fa61eb4988214f8632b33ce':
Remove androidGetTid.
2014-08-18 19:34:23 +00:00
Piotr Jastrzebski
c77755f139
am f81da073: am c0879ee9: Merge "Replace char* with ZipEntryName in ziparchive API."
...
* commit 'f81da073dab8c6eba0a86975f4d94eae5dc461cf':
Replace char* with ZipEntryName in ziparchive API.
2014-08-18 09:13:07 +00:00
Piotr Jastrzebski
c0879ee9d3
Merge "Replace char* with ZipEntryName in ziparchive API."
2014-08-16 04:31:31 +00:00
Elliott Hughes
b7659613b2
Remove androidGetTid.
...
Bug: 17048545
Change-Id: I93cbb2d7bd18d506b5f5f7f262dd9ac0fca053b4
2014-08-18 10:47:37 -07:00
Jeff Brown
84a248ce27
am 69d68b69: Merge "Add trace tag for power management." into lmp-dev
...
* commit '69d68b69e5341124c1947f3110c67aa8836e3437':
Add trace tag for power management.
2014-08-16 03:14:32 +00:00
Jeff Brown
69d68b69e5
Merge "Add trace tag for power management." into lmp-dev
2014-08-15 18:45:09 +00:00
Calin Juravle
62de21e148
am 5ed25acd: am 25a7d5f8: Merge "Move native bridge library in system/core"
...
* commit '5ed25acd4ab7c606986c77892c07c2914f8df8f2':
Move native bridge library in system/core
2014-08-15 12:42:36 +00:00
Piotr Jastrzebski
ecccc5ad93
Replace char* with ZipEntryName in ziparchive API.
...
It's important because entry names can be encoded in UTF-8 and can have \0
character in the middle.
Use vector instead of char* for prefix in IterationHandle.
Bug: 16162465
Change-Id: Ie34c8d7c6231cc258530c22bdde5542895213649
2014-08-15 12:39:45 +01:00
Calin Juravle
4914fcd91b
Move native bridge library in system/core
...
Bug: 16884833
(cherry picked from commit 961ae12dea )
Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
2014-08-15 12:40:45 +01:00
Calin Juravle
25a7d5f892
Merge "Move native bridge library in system/core"
2014-08-15 04:45:59 +00:00
Jeff Brown
de4d921192
Add trace tag for power management.
...
Bug: 17004602
Change-Id: Iecd79e6e0417c02b902cde468b0e842f9348b386
2014-08-14 19:24:30 -07:00
Piotr Jastrzebski
d5d04be07f
am fa412127: am b242ad40: Merge "Revert "Make sure that names of all entries have the same encoding.""
...
* commit 'fa41212789a068827edc9fd1eac7b6a988cba0a5':
Revert "Make sure that names of all entries have the same encoding."
2014-08-13 10:02:23 +00:00
Piotr Jastrzebski
8b4a58e1df
am b720c8d6: am b0206765: Merge "Make sure that names of all entries have the same encoding."
...
* commit 'b720c8d601cebbc9f48ef8e51c23fd6d190305f7':
Make sure that names of all entries have the same encoding.
2014-08-13 09:09:36 +00:00
Calin Juravle
961ae12dea
Move native bridge library in system/core
...
Bug: 16884833
Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-12 22:39:25 +01:00
Piotr Jastrzebski
bd0a74854e
Revert "Make sure that names of all entries have the same encoding."
...
This reverts commit 6a7f4bb79d .
Change-Id: Id4f5b601ff0b9d82ce2c9beeb9162eba9594b3a7
2014-08-13 09:49:25 +00:00
Piotr Jastrzebski
6a7f4bb79d
Make sure that names of all entries have the same encoding.
...
Add new public method to allow checkisc if an archive has entry names encoded in
UTF-8. If not then they will be encoded in IBM PC character encoding.
Bug: 16162465
Change-Id: I4468d76accca8a9b0b31cae8d43399ffc22cad42
2014-08-13 09:58:16 +01:00
Piotr Jastrzebski
6a993053c8
am 6871f937: am 400e7372: Merge "Add EndIteration method to free memory allocated"
...
* commit '6871f937f93c2a37344b928203ec613559584d33':
Add EndIteration method to free memory allocated
2014-08-11 09:57:52 +00:00
Rachad
9cf963d61e
am cc2566f1: Merge "Tunneled Video Playback support" into lmp-dev
...
* commit 'cc2566f12760d66837b52213e5ffd2cb30cce19e':
Tunneled Video Playback support
2014-08-09 05:07:13 +00:00
Rachad
cc2566f127
Merge "Tunneled Video Playback support" into lmp-dev
2014-08-09 00:51:24 +00:00
Piotr Jastrzebski
79c8b34f36
Add EndIteration method to free memory allocated
...
in StartIteration. This method should always be called when the
iteration is over to make sure that we don't leak memory.
Change-Id: I5205c754dfafbab9bb5f06003c3663d2ec4e8a35
2014-08-11 07:58:00 +01:00
Elliott Hughes
aab3b34cd7
am 4c818dc8: am 56b28f6b: Merge "RefBase: make Renamer destructor virtual"
...
* commit '4c818dc800d97e2fdee0337a0e9736099d90cc47':
RefBase: make Renamer destructor virtual
2014-08-06 22:48:30 +00:00
Eric Laurent
c85cce96af
am fb2343da: Merge "audio: add defines for audio HW sync source" into lmp-dev
...
* commit 'fb2343da60bdf56205a29ec11db5e3bdd87d9651':
audio: add defines for audio HW sync source
2014-08-06 20:30:22 +00:00
Eric Laurent
d91e6df901
audio: add defines for audio HW sync source
...
Bug: 16132368.
Change-Id: I4008c315f2cba9c6027998be92f4af649359bcce
2014-08-05 15:02:57 -07:00
Elliott Hughes
a613844e13
am e07a6e63: am 6d9a5ac3: Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"
...
* commit 'e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd':
[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
2014-08-05 21:43:16 +00:00
Eric Laurent
3b1215c374
Merge "sound_trigger HAL update" into lmp-dev
2014-08-05 17:41:31 +00:00