Commit graph

6853 commits

Author SHA1 Message Date
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
c121c69b85 am b0751101: Merge "HP USB ID"
* commit 'b0751101b090a8732c62ad261fa44e5d6a69a2cc':
  HP USB ID
2014-01-09 09:59:30 -08: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
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
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
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
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
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
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
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
a166bea18f am f5447b0e: Merge "Fix a sporadic build breakage."
* commit 'f5447b0eb9cd2157f4935477f05d4c92dcda37c8':
  Fix a sporadic build breakage.
2014-01-03 13:12:12 -08:00
Elliott Hughes
f5447b0eb9 Merge "Fix a sporadic build breakage." 2014-01-03 21:08:01 +00:00
Colin Cross
4600d80cef am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"
* commit 'e1095e1da12de9d6dc219f497f7c19d1c1f7a41b':
  Modify BYD's USB Vendor ID
2014-01-03 12:58:31 -08:00
Colin Cross
e1095e1da1 Merge "Modify BYD's USB Vendor ID" 2014-01-03 20:53:22 +00:00
Nick Kralevich
8be1ccff87 am fcf3d207: Merge "adb: configure /system file permission with fs_config"
* commit 'fcf3d207c51f1e734137a08ae2fdb1bb37a50b87':
  adb: configure /system file permission with fs_config
2014-01-03 11:04:02 -08:00
Nick Kralevich
fcf3d207c5 Merge "adb: configure /system file permission with fs_config" 2014-01-03 18:58:13 +00:00
Narayan Kamath
95986aae91 Fix a sporadic build breakage.
The issue here is that the makefile sets LOCAL_LDFLAGS
and asks for -llog without declaring a dependency on it.
This will cause build breakages if liblog hasn't already
been built yet.

Change-Id: Ia38761cda44a38b6c2a88902d6108cbe64a328ce
2014-01-03 15:40:37 +00:00
Narayan Kamath
2264bd23a6 am 4958d85d: Merge "Change a debug log to a verbose log."
* commit '4958d85d23c03fdde6b3b44793aa2738caef9717':
  Change a debug log to a verbose log.
2014-01-03 01:42:57 -08:00
Narayan Kamath
4958d85d23 Merge "Change a debug log to a verbose log." 2014-01-03 09:30:29 +00:00
Nick Kralevich
49264407de am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"
* commit '7139b0c7f8b3c86c866096cb8621a0d866af1614':
  toolbox-ls: re-introduce clobbered error message
2014-01-02 21:18:04 -08:00
Nick Kralevich
7139b0c7f8 Merge "toolbox-ls: re-introduce clobbered error message" 2014-01-03 05:13:28 +00:00
Liang Cheng
20d33f4d99 adb: configure /system file permission with fs_config
adbd changes the permissions of files uploaded by copying
owner's permission to group and other. This causes kernel
load failure if any changes are made to kernel modules
followed by ``adb push'' or ``adb sync'' because file mode
644 would become 666.

The change uses fs_config to get the target mode of files.

In addition, the SELinux file label is set incorrectly
on synced files. Set the label properly.

Change-Id: I354db848f39adfbf189d7e8d3b028e8d763c772f
Signed-off-by: Liang Cheng <licheng@nvidia.com>
Bug: 12264775
2014-01-02 20:26:18 -08:00
William Roberts
ded3464a10 toolbox-ls: re-introduce clobbered error message
commit 403b1955 clobbered the error message on lstat()
calls.

Change-Id: Idbd24b648e3a85079b8f8541c0798bf944485ca1
2014-01-03 02:52:34 +00:00
Elliott Hughes
a345b25371 am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."
* commit 'dfc48139c9afc8366184a1a7bc2f3762c0c82ea2':
  Switch ARM back to libcorkscrew temporarily.
2014-01-02 15:31:13 -08:00
Elliott Hughes
dfc48139c9 Merge "Switch ARM back to libcorkscrew temporarily." 2014-01-02 23:26:51 +00:00