Christopher Ferris
7a6e8c9adc
am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."
...
* commit 'ec7894cf5c08737f5dccacf462dd47c324309c64':
Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
2014-01-10 00:06:50 +00:00
Christopher Ferris
ec7894cf5c
am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."
...
* commit 'c369f1993b41dac8ac1a005b3bc9312dfa5ebd63':
Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
2014-01-10 00:04:53 +00:00
Christopher Ferris
c369f1993b
am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."
...
* commit '6e25786914d5f8c50040471c8b1a950d2efb32a1':
Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
2014-01-09 16:02:21 -08:00
Christopher Ferris
6e25786914
Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."
2014-01-09 23:55:52 +00:00
Christopher Ferris
72256db76e
am c49bd655: am 5d2ec87b: am b18f93ea: Merge "Move CallStack to libbacktrace."
...
* commit 'c49bd655e5233f367c535ed4324bbadc4aea5453':
Move CallStack to libbacktrace.
2014-01-09 23:50:57 +00:00
Christopher Ferris
bc12d6329e
Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
...
Use a bit better name for this. The other name was a bit confusing.
Change-Id: I1261f2ee3854a9c8b82133ad0bfbbbe48b43c9ac
(cherry picked from commit 242b1a8c7a
)
Conflicts:
libbacktrace/Backtrace.cpp
2014-01-09 15:49:39 -08:00
Christopher Ferris
c49bd655e5
am 5d2ec87b: am b18f93ea: Merge "Move CallStack to libbacktrace."
...
* commit '5d2ec87bf54dc8a02e6bcbe5848fd378056b8f78':
Move CallStack to libbacktrace.
2014-01-09 23:48:26 +00:00
Christopher Ferris
5d2ec87bf5
am b18f93ea: Merge "Move CallStack to libbacktrace."
...
* commit 'b18f93ea5d57b8dff31c6cc706c6b4f32180c0c8':
Move CallStack to libbacktrace.
2014-01-09 15:46:44 -08:00
Christopher Ferris
b18f93ea5d
Merge "Move CallStack to libbacktrace."
2014-01-09 23:41:14 +00:00
Christopher Ferris
038ac694b3
Move CallStack to libbacktrace.
...
Fix a small bug in the Printer for strings that didn't properly
prepend the prefix.
(cherry picked from commit 9b0e074c6d
)
Change-Id: I78bfa3f76864c34f33fb439bf20dfc85616f1077
2014-01-09 15:09:13 -08:00
Colin Cross
3fb5ebc565
am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"
...
* commit '3794c96f3e7bb27e56336035bcd7ac643c6869fc':
HP USB ID
2014-01-09 18:04:17 +00:00
Colin Cross
3794c96f3e
am c121c69b: am b0751101: Merge "HP USB ID"
...
* commit 'c121c69b856bfa9baea105439fbdac648d154097':
HP USB ID
2014-01-09 18:01:55 +00:00
Colin Cross
4082bf8c96
am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"
...
* commit 'ce1340c665e8840c8856898bbfb7ee3b33765359':
Fix tracing on user builds
2014-01-09 18:00:54 +00:00
Colin Cross
c121c69b85
am b0751101: Merge "HP USB ID"
...
* commit 'b0751101b090a8732c62ad261fa44e5d6a69a2cc':
HP USB ID
2014-01-09 09:59:30 -08:00
Colin Cross
ce1340c665
am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"
...
* commit '5a3696297b2f8d463ba601772df7af5966321d2e':
Fix tracing on user builds
2014-01-09 17:58:28 +00:00
Colin Cross
5a3696297b
am cd0f824a: Merge "Fix tracing on user builds"
...
* commit 'cd0f824a7cfe91f4db24511830658228487ae919':
Fix tracing on user builds
2014-01-09 09:56:04 -08:00
Colin Cross
b0751101b0
Merge "HP USB ID"
2014-01-09 17:52:21 +00:00
Colin Cross
cd0f824a7c
Merge "Fix tracing on user builds"
2014-01-09 17:50:34 +00:00
Christopher Ferris
72f204de1f
am 5ca7d87f: am f1f150d0: am 0c863cb5: Merge "Refactor to share map_info amongst threads."
...
* commit '5ca7d87fe47ad18594b5c5f79d00aa86ed1435cb':
Refactor to share map_info amongst threads.
2014-01-08 23:45:54 +00:00
Nick Kralevich
218878d447
am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."
...
* commit 'df8d0ffd73f8359def90d2f79d25059023018213':
Label existing /data/mediadrm files.
2014-01-08 23:45:53 +00:00
Christopher Ferris
5ca7d87fe4
am f1f150d0: am 0c863cb5: Merge "Refactor to share map_info amongst threads."
...
* commit 'f1f150d0e6e27588d0b15a53e7fac4984bf6ccd8':
Refactor to share map_info amongst threads.
2014-01-08 23:43:53 +00:00
Christopher Ferris
f1f150d0e6
am 0c863cb5: Merge "Refactor to share map_info amongst threads."
...
* commit '0c863cb5848795ac87e62dc34d2eab103c830dde':
Refactor to share map_info amongst threads.
2014-01-08 15:42:04 -08:00
Christopher Ferris
0c863cb584
Merge "Refactor to share map_info amongst threads."
2014-01-08 23:36:51 +00:00
Christopher Ferris
9846497f79
Refactor to share map_info amongst threads.
...
Allow the use of the same map info to be shared when getting information on
multiple threads from the same pid.
Change-Id: I2e460e20154a10f4894ae563331fb32179e4551f
2014-01-08 15:32:28 -08:00
Nick Kralevich
df8d0ffd73
am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."
...
* commit '72f269f3050b3e5b2fd6be7d0a6a485114cc6ee7':
Label existing /data/mediadrm files.
2014-01-08 17:44:32 +00:00
Nick Kralevich
72f269f305
am 8830b53b: Merge "Label existing /data/mediadrm files."
...
* commit '8830b53b76c05416c021df3eb0cea1dd541bc3ac':
Label existing /data/mediadrm files.
2014-01-08 09:39:20 -08:00
Nick Kralevich
8830b53b76
Merge "Label existing /data/mediadrm files."
2014-01-08 17:34:52 +00:00
Jon Sawyer
5ff167ca11
HP USB ID
...
Adds HP's USB id to the know USB Devices
Change-Id: I975126f3ae5e53f25e18dea7cc43c29076bfc965
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
2014-01-08 08:14:26 -08:00
rpcraig
2dcbb81d89
Label existing /data/mediadrm files.
...
Use restorecon_recursive to label devices
where the directory and subfiles have
already been built and labeled.
Change-Id: I0dfe1e542fb153ad20adf7b2b1f1c087b4956a12
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-01-07 22:28:04 -05:00
Elliott Hughes
16f0d3dc3a
am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."
...
* commit 'e61495c9b82e0bb4893095405518c23a55092f3a':
SWAP_FLAG_* constants are now in <sys/swap.h>.
2014-01-08 02:45:58 +00:00
Elliott Hughes
e61495c9b8
am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."
...
* commit '2ab2e110ce533c4f2095e954f645bdb52081e578':
SWAP_FLAG_* constants are now in <sys/swap.h>.
2014-01-08 02:44:05 +00:00
Elliott Hughes
2ab2e110ce
am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."
...
* commit 'bc836220f3ae6afd5d6409e0c9dfaaafc1ce4afa':
SWAP_FLAG_* constants are now in <sys/swap.h>.
2014-01-07 18:42:28 -08:00
Elliott Hughes
bc836220f3
Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."
2014-01-08 02:38:17 +00:00
Elliott Hughes
bfa7d0822b
SWAP_FLAG_* constants are now in <sys/swap.h>.
...
Bug: 9336527
Change-Id: I77e2b05cefbfb4eebda39b4079107833f4160563
2014-01-07 18:20:17 -08:00
Christopher Ferris
0298da56f4
am 492b0ca4: am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86."
...
* commit '492b0ca4b127a217305b4adf6f26a627a288f6bf':
Fix the ucontext for mips/x86.
2014-01-07 22:52:32 +00:00
Christopher Ferris
492b0ca4b1
am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86."
...
* commit '1e424d8ef54c4056416d19b54ef016304c957fe1':
Fix the ucontext for mips/x86.
2014-01-07 22:50:22 +00:00
Christopher Ferris
1e424d8ef5
am 0afaf7f4: Merge "Fix the ucontext for mips/x86."
...
* commit '0afaf7f4dde98ff554b69d05ed87ceab4ec611aa':
Fix the ucontext for mips/x86.
2014-01-07 14:47:55 -08:00
Christopher Ferris
0afaf7f4dd
Merge "Fix the ucontext for mips/x86."
2014-01-07 22:43:44 +00:00
Christopher Ferris
ddc4f093f7
Fix the ucontext for mips/x86.
...
Remove the mips ucontext definition, there is no need for it any more.
Fix the mips/x86 ucontext copy code to copy the entire uc_mcontext data
across.
Fix a potential memory leak too.
Change-Id: I4272022da5281ed881e2d59a3e19e7f33c01aceb
2014-01-07 14:36:03 -08:00
Elliott Hughes
ea91fb976a
am 1858c2a2: am ba5f5fdd: am e21d03ce: Merge "Dwarf backtrace for MIPS"
...
* commit '1858c2a2ebb9284dfbc3f2bcc52d9179d1d44a26':
Dwarf backtrace for MIPS
2014-01-07 20:14:53 +00:00
Elliott Hughes
1858c2a2eb
am ba5f5fdd: am e21d03ce: Merge "Dwarf backtrace for MIPS"
...
* commit 'ba5f5fdd774223b3a801626cde014637e0fb04ec':
Dwarf backtrace for MIPS
2014-01-07 20:12:32 +00:00
Elliott Hughes
ba5f5fdd77
am e21d03ce: Merge "Dwarf backtrace for MIPS"
...
* commit 'e21d03ce3722582980be2c84ffbc6b6ccf55e258':
Dwarf backtrace for MIPS
2014-01-07 12:09:55 -08:00
Elliott Hughes
e21d03ce37
Merge "Dwarf backtrace for MIPS"
2014-01-07 20:04:58 +00:00
Colin Cross
b1b187f7c8
am 748ab31f: am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...
...
* commit '748ab31ffbe3268249a8ef3dadbf6a79bd8df389':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
2014-01-06 20:29:07 +00:00
Todd Poynor
7eea6200cb
am 950909c3: init.rc: start lmkd
...
* commit '950909c301e316783e5b4687dbc422ed845cb69a':
init.rc: start lmkd
2014-01-06 20:29:06 +00:00
Todd Poynor
85679224ae
am 58d58072: Add lmkd low memory killer daemon
...
* commit '58d58072894521874df8c90c0084fd50cf16b7fc':
Add lmkd low memory killer daemon
2014-01-06 20:29:06 +00:00
Colin Cross
748ab31ffb
am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...
...
* commit 'd8f74f1b3e40d64fafcd327066428235f0312c47':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
2014-01-06 20:26:16 +00:00
Colin Cross
d8f74f1b3e
am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...
...
* commit '491ecd0b7275a98b7fda9b1e807724f7f06b1469':
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
2014-01-06 12:23:30 -08:00
Colin Cross
491ecd0b72
Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...
...
* changes:
adb: Add USB vendor ID for YotaDevices
adb: Add USB vendor ID for TechFaith
adb: Add USB vendor ID for Rockchip
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
adb: Add USB vendor ID for Allwinner
adb: Add USB vendor ID for Amlogic
added Gigaset's USB vendor ID
adb: alphabetically sort usb vendors lists
2014-01-06 20:18:34 +00:00
DanielMo
c1b6b153dc
adb: Add USB vendor ID for YotaDevices
...
Change-Id: Id8bec8a35edd0d21ae52e8469f7a65b5f4433bc2
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:40 -08:00