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
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
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
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
DanielMo
402c2b9888
adb: Add USB vendor ID for TechFaith
...
Change-Id: Ied42e4d011b736ee990ed75e7d81bc6a16db47f9
2014-01-06 12:16:40 -08:00
DanielMo
d0057c006b
adb: Add USB vendor ID for Rockchip
...
Change-Id: Iea3f7cc6ed463684fe30a73c39445b3ca36854d9
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
DanielMo
fdd189c64e
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
...
Change-Id: Ic7f7c984db19050d2ce4da8ae87683ce42dc9094
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
DanielMo
63f0f5117b
adb: Add USB vendor ID for Allwinner
...
Change-Id: Ic77d5f71c9e329e33cd31fa0854e692ad794a609
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
DanielMo
d5dab6d5f8
adb: Add USB vendor ID for Amlogic
...
Change-Id: I35fad82214f2b5a82b0150821326aaea15784de1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
Volker Moesker
319d8c1d1f
added Gigaset's USB vendor ID
...
Change-Id: Iebb0f352eec4530ee1e972527fc76bbb9dad5cc3
Signed-off-by: Volker Moesker <volker.moesker@gigaset.com>
2014-01-06 12:16:29 -08:00
Colin Cross
293717c364
adb: alphabetically sort usb vendors lists
...
Sort the lists of usb vendor ids alphabetically to reduce future
conflicts.
Change-Id: I682c18a1d97adf3a4aa9c00de9fed932c83e4646
2014-01-06 12:12:39 -08:00
Todd Poynor
950909c301
init.rc: start lmkd
...
Change-Id: Ibebab31e1f41a210821834a1d65f196b39bb6601
2014-01-04 00:29:10 +00:00
Todd Poynor
58d5807289
Add lmkd low memory killer daemon
...
Move kernel low memory killer logic to new daemon lmkd. ActivityManager
communicates with this daemon over a named socket.
Change-Id: Ie957da7e9b1f7150e23c689fdadf23ff260b47be
(cherry picked from commit 3948f80f2a )
2014-01-04 00:01:38 +00:00
Rom Lemarchand
79b6b7f0fd
am 1892fe66: am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"
...
* commit '1892fe66ea4df6d4b6ea7fe3849295f79adcfbf2':
move sync headers from include to libsync
2014-01-03 21:39:31 +00:00
Rom Lemarchand
1892fe66ea
am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"
...
* commit 'c8d7d2d6b99f405ea3fcada0d2407baee23873f6':
move sync headers from include to libsync
2014-01-03 21:35:54 +00:00
Rom Lemarchand
c8d7d2d6b9
am 5234147c: Merge "move sync headers from include to libsync"
...
* commit '5234147c1e5cade7ecf98c12c8a7d7de6cd429ed':
move sync headers from include to libsync
2014-01-03 13:33:07 -08:00
Rom Lemarchand
5234147c1e
Merge "move sync headers from include to libsync"
2014-01-03 21:27:46 +00:00
Rom Lemarchand
ddc20de148
move sync headers from include to libsync
...
Make sw_sync.h private
Change-Id: I0b120ebe81fd4a191b7aa4b6a8de4f64d16e2b3e
2014-01-03 21:27:05 +00:00
Elliott Hughes
60298601c5
am 687ec9b5: am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."
...
* commit '687ec9b5e143aa92de008efcaa7b5750eeab87ef':
Fix a sporadic build breakage.
2014-01-03 21:16:45 +00:00