Commit Graph

6922 Commits

Author SHA1 Message Date
Colin Cross e0e7595f3c am e76343ef: Merge "Emerson USB ID"
* commit 'e76343ef72458aff8fdc25c57f4e84407c05a2f2':
  Emerson USB ID
2014-01-11 23:09:48 -08:00
Colin Cross e76343ef72 Merge "Emerson USB ID" 2014-01-12 07:05:04 +00:00
Jon Sawyer 6e39bace17 Emerson USB ID
Adds Emerson's USB id to the known USB Devices.

Change-Id: If6115c2551c1f30a5c190690f2aeaaf2adff7ee1
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
2014-01-11 22:59:18 -08:00
Nick Kralevich a613819a96 restorecon_recursive("/sys") speed boot time
Currently, the restorecon_recursive("/sys") call in
init.c takes approx 2 seconds on hammerhead. This change
reduces the delay to 1.2 seconds.

1) Avoid double stat call when using nftw (time savings
of 0.3 seconds)
2) Avoid the repeated calls to is_selinux_enabled() (time
savings of 0.5 seconds)

Avoid calling lsetfilecon if the file is already properly
labeled. This doesn't speed up the restorecon on /sys,
but it should help when handling files on /data.

Bug: 11640230
Change-Id: Ie212ce4f4acade208c5676d60c1f03f50e2388a4
2014-01-10 19:49:14 -08:00
Christopher Ferris a7083e0dd2 am 8387fc93: Merge "Move to C++ for debuggerd."
* commit '8387fc938e044a2bf2840139203af7f9b3884029':
  Move to C++ for debuggerd.
2014-01-10 16:23:39 -08:00
Christopher Ferris 8387fc938e Merge "Move to C++ for debuggerd." 2014-01-11 00:19:56 +00:00
Christopher Ferris d607495b89 Move to C++ for debuggerd.
This is part 1, only including the bare minimum changes because
our diff tool doesn't easily show differences when a file moves. This
also breaks it into a small chunk in case some other changes break things,
as unlikely as I think that will be.

Change-Id: Ib7a3e7a2cc1ac574d15b65fda23813ebcf5d31af
2014-01-10 16:05:12 -08:00
Christopher Ferris e8e5f8edc1 am 261ff50e: Merge "Init the abort_msg_address value."
* commit '261ff50e32b2b2a41bd3993c37abb5a9a94e431b':
  Init the abort_msg_address value.
2014-01-10 15:02:42 -08:00
Elliott Hughes 1972955eca am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."
* commit '99775d8751676e76e00ad72d7778ad9ba28cb454':
  Use the more portable <elf.h> instead of <sys/exec_elf.h>.
2014-01-10 14:59:20 -08:00
Christopher Ferris 261ff50e32 Merge "Init the abort_msg_address value." 2014-01-10 22:56:38 +00:00
Elliott Hughes 99775d8751 Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>." 2014-01-10 22:54:46 +00:00
Christopher Ferris 1da83c3ecc Init the abort_msg_address value.
When initiating a manual dump, the abort_msg_address parameter is random
garbage. Initialize this value to 0.

Change-Id: I9ba817ee6104f47cfcb2b746bfa6f02a259c86d7
2014-01-10 14:46:03 -08:00
Elliott Hughes cac5d8c223 Use the more portable <elf.h> instead of <sys/exec_elf.h>.
Bug: 12476126
Change-Id: I08684987e867371d5537dadf1acb3408b420ad0c
2014-01-10 14:40:53 -08:00
Benoit Goby 709543a968 am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"
* commit '08a140e6a3989ece3854014123dac243cc372886':
  toolbox: Fix date tool with /dev/alarm
2014-01-09 19:37:31 -08:00
Benoit Goby 08a140e6a3 Merge "toolbox: Fix date tool with /dev/alarm" 2014-01-10 03:31:56 +00:00
Benoit Goby d340734cd7 toolbox: Fix date tool with /dev/alarm
Change-Id: I6f8ad2149244c89690d5d5caae8ec55429462210
Signed-off-by: Benoit Goby <benoit@android.com>
2014-01-09 18:59:23 -08: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 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 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