summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."Christopher Ferris2014-01-094-17/+24
|\ \
| * | Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.Christopher Ferris2014-01-094-17/+24
|/ / | | | | | | | | | | | | | | | | | | | | Use a bit better name for this. The other name was a bit confusing. Change-Id: I1261f2ee3854a9c8b82133ad0bfbbbe48b43c9ac (cherry picked from commit 242b1a8c7a5ec73172bac811e51acbc27201f22c) Conflicts: libbacktrace/Backtrace.cpp
* | Merge "Move CallStack to libbacktrace."Christopher Ferris2014-01-096-123/+36
|\ \
| * | Move CallStack to libbacktrace.Christopher Ferris2014-01-096-123/+36
|/ / | | | | | | | | | | | | | | | | Fix a small bug in the Printer for strings that didn't properly prepend the prefix. (cherry picked from commit 9b0e074c6d38143e01616404a08b0c7aa992f3c3) Change-Id: I78bfa3f76864c34f33fb439bf20dfc85616f1077
* | Merge "HP USB ID"Colin Cross2014-01-091-0/+3
|\ \
| * | HP USB IDJon Sawyer2014-01-081-0/+3
| |/ | | | | | | | | | | | | Adds HP's USB id to the know USB Devices Change-Id: I975126f3ae5e53f25e18dea7cc43c29076bfc965 Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
* | Merge "Fix tracing on user builds"Colin Cross2014-01-091-0/+2
|\ \
| * | Fix tracing on user buildsCarton He2013-12-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Need the set correct permission for print-tgid option or tracing of sched can't work on user build. Change-Id: Ia88aabe58128b911afd78f01c27f7da884ed03f0 Signed-off-by: Carton He <carton.he@marvell.com>
* | | Merge "Refactor to share map_info amongst threads."Christopher Ferris2014-01-0810-44/+75
|\ \ \
| * | | Refactor to share map_info amongst threads.Christopher Ferris2014-01-0810-44/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the use of the same map info to be shared when getting information on multiple threads from the same pid. Change-Id: I2e460e20154a10f4894ae563331fb32179e4551f
* | | | Merge "Label existing /data/mediadrm files."Nick Kralevich2014-01-081-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Label existing /data/mediadrm files.rpcraig2014-01-071-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge "SWAP_FLAG_* constants are now in <sys/swap.h>."Elliott Hughes2014-01-082-11/+0
|\ \ \ | |/ / |/| |
| * | SWAP_FLAG_* constants are now in <sys/swap.h>.Elliott Hughes2014-01-072-11/+0
| | | | | | | | | | | | | | | Bug: 9336527 Change-Id: I77e2b05cefbfb4eebda39b4079107833f4160563
* | | Merge "Fix the ucontext for mips/x86."Christopher Ferris2014-01-071-15/+4
|\ \ \ | |/ / |/| |
| * | Fix the ucontext for mips/x86.Christopher Ferris2014-01-071-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Dwarf backtrace for MIPS"Elliott Hughes2014-01-074-84/+1061
|\ \ \ | |/ / |/| |
| * | Dwarf backtrace for MIPSChris Dearman2013-12-114-84/+1061
| | | | | | | | | | | | | | | | | | | | | The Dwarf parsing code was copied from backtrace-x86.c and modified for MIPS Change-Id: I62c698fbbea28be39320a921dd778269dc478528
* | | Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...Colin Cross2014-01-061-150/+175
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | adb: Add USB vendor ID for YotaDevicesDanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Id8bec8a35edd0d21ae52e8469f7a65b5f4433bc2 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| * | | adb: Add USB vendor ID for TechFaithDanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | | Change-Id: Ied42e4d011b736ee990ed75e7d81bc6a16db47f9
| * | | adb: Add USB vendor ID for RockchipDanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Iea3f7cc6ed463684fe30a73c39445b3ca36854d9 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| * | | adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.DanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic7f7c984db19050d2ce4da8ae87683ce42dc9094 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| * | | adb: Add USB vendor ID for AllwinnerDanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic77d5f71c9e329e33cd31fa0854e692ad794a609 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| * | | adb: Add USB vendor ID for AmlogicDanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I35fad82214f2b5a82b0150821326aaea15784de1 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| * | | added Gigaset's USB vendor IDVolker Moesker2014-01-061-1/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Iebb0f352eec4530ee1e972527fc76bbb9dad5cc3 Signed-off-by: Volker Moesker <volker.moesker@gigaset.com>
| * | | adb: alphabetically sort usb vendors listsColin Cross2014-01-061-150/+155
|/ / / | | | | | | | | | | | | | | | | | | Sort the lists of usb vendor ids alphabetically to reduce future conflicts. Change-Id: I682c18a1d97adf3a4aa9c00de9fed932c83e4646
* | | Merge "move sync headers from include to libsync"Rom Lemarchand2014-01-035-3/+4
|\ \ \
| * | | move sync headers from include to libsyncRom Lemarchand2014-01-035-3/+4
|/ / / | | | | | | | | | | | | | | | Make sw_sync.h private Change-Id: I0b120ebe81fd4a191b7aa4b6a8de4f64d16e2b3e
* | | Merge "Fix a sporadic build breakage."Elliott Hughes2014-01-031-1/+1
|\ \ \
| * | | Fix a sporadic build breakage.Narayan Kamath2014-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Modify BYD's USB Vendor ID"Colin Cross2014-01-031-1/+1
|\ \ \ \
| * | | | Modify BYD's USB Vendor IDkongfanqing2013-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I391487a12ba7ed86aac81457f8026acd3fd7576c
* | | | | Merge "adb: configure /system file permission with fs_config"Nick Kralevich2014-01-032-10/+65
|\ \ \ \ \
| * | | | | adb: configure /system file permission with fs_configLiang Cheng2014-01-022-10/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Change a debug log to a verbose log."Narayan Kamath2014-01-031-1/+1
|\ \ \ \ \ \
| * | | | | | Change a debug log to a verbose log.Narayan Kamath2014-01-021-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike ALOGV, messages from ALOGD are logged on all configurations. Not finding an entry in a zip file is a "normal" occurrence so using an ALOGD message for it amounts to spam. Change-Id: I2c60d11e8a750be5106afd65c3c5e335f53f01b6
* | | | | | Merge "toolbox-ls: re-introduce clobbered error message"Nick Kralevich2014-01-031-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | toolbox-ls: re-introduce clobbered error messageWilliam Roberts2014-01-031-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 403b1955 clobbered the error message on lstat() calls. Change-Id: Idbd24b648e3a85079b8f8541c0798bf944485ca1
* | | | | Merge "Switch ARM back to libcorkscrew temporarily."Elliott Hughes2014-01-021-2/+5
|\ \ \ \ \
| * | | | | Switch ARM back to libcorkscrew temporarily.Elliott Hughes2014-01-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're seeing major stack trace generation performance regression and want to find out whether it's libunwind. Bug: 12181612 Change-Id: I3866ea956859f5cbdfe4f1ee6f20a2b6d39962c4
* | | | | | Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."Nick Kralevich2014-01-021-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.Stephen Smalley2013-12-231-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If checkreqprot == 1, SELinux only checks the protection flags passed by the application, even if the kernel internally adds PROT_EXEC for READ_IMPLIES_EXEC personality flags. Switch to checkreqprot == 0 to check the final protection flags applied by the kernel. Change-Id: Ic39242bbbd104fc9a1bcf2cd2ded7ce1aeadfac4 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | Merge "ueventd: fix a busy loop while reading uevents"Colin Cross2013-12-282-2/+2
|\ \ \ \ \
| * | | | | ueventd: fix a busy loop while reading ueventsAmir Goldstein2013-11-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under certain conditions, poll() may raise the POLLERR flag along with POLLIN, in which case the check for (ufd.revents == POLLIN) results in an endless busy loop. The following fix was applied to hardware/libhardware_legacy/uevent/uevent.c to fix a similar bug: commit 3aabb260ceef10377c31c9e45fb239247f5cfeba Author: Mathias Agopian <mathias@google.com> Date: Mon Oct 1 14:53:18 2012 -0700 fix a typo in uevent_next_eventi Bug: 7114973 Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2 Applying the same fix for two more poll loops in init and ueventd. Change-Id: I50693f6d3c904992ac4b8a9a14a83c7106e6b9e0
* | | | | | Merge "Run the console service shell in the shell domain."Colin Cross2013-12-271-0/+1
|\ \ \ \ \ \
| * | | | | | Run the console service shell in the shell domain.Stephen Smalley2013-12-231-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows it to be permissive in userdebug/eng builds but confined/enforcing in user builds. Change-Id: Ie322eaa0acdbefea2de4e71ae386778c929d042b Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | Merge changes Ie4b641cd,I5502b71d,I68086ce4Colin Cross2013-12-2713-1/+1526
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: libion: add apache license header to ion_test.c libion: initial unit tests libion: update ion_test.h
| * | | | | libion: add apache license header to ion_test.cColin Cross2013-12-191-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4b641cd62b56f713178932cc5c08083c0d2452a
| * | | | | libion: initial unit testsColin Cross2013-12-1910-0/+1506
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5502b71d0c7c24d7fd59e4880033657f840b341a
generated by cgit v1.1 at 2025-03-22 07:43:57 +0000