openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,326 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

7326 Commits

Author SHA1 Message Date
Christopher Ferris 4a3a0edce1 am 7a6e8c9a: am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD." 
* commit '7a6e8c9adcb7fa46a16fe930c1c81c94f2a0daef':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
 2014-01-10 01:54:26 +00:00
Christopher Ferris 5bbf7d3a5e resolved conflicts for merge of 72256db7 to master 
Change-Id: I0b137b011d46d1689fa4e406a2ae0675147510a8
 2014-01-09 17:52:46 -08:00
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
Mark Salyzyn 153b370624 liblog: resolve build warning messages 
Change-Id: Icc6f1f2c926a008efc4df71022cfde8d0e285880
 2014-01-09 10:42:20 -08:00
Mark Salyzyn 6aedf1d3d4 Merge "liblog: high CPU usage from logcat" 2014-01-09 18:08:52 +00:00
Colin Cross 4f3c6aed7b am 3fb5ebc5: am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID" 
* commit '3fb5ebc565f1550d61c4afb4ae6f9afa73cf12b3':
  HP USB ID
 2014-01-09 18:06:41 +00: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 0a05f002fb am 4082bf8c: am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on user builds" 
* commit '4082bf8c963dbd44fe2f6367fa687217cbac58d3':
  Fix tracing on user builds
 2014-01-09 18:03:13 +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
Mark Salyzyn 080bbfab94 liblog: high CPU usage from logcat 
BUG: 12457855

- log_read.c poll timeout should be -1 instead of 0 when idling

Change-Id: I9082a15fae0fbf999c0ed516950a49d65a279298
 2014-01-09 09:04:59 -08:00
Christopher Ferris a74ead0fd6 resolved conflicts for merge of 72f204de to master 
Change-Id: I7345014d00c669aea5e27ea50b2ac658145b068b
 2014-01-08 16:20:50 -08:00
Nick Kralevich 0969ec3a55 am 218878d4: am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files." 
* commit '218878d447b58b357f0dc97bfe6b77196d35a729':
  Label existing /data/mediadrm files.
 2014-01-08 23:49:18 +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 ebf1b66c81 am 16f0d3dc: am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* constants are now in <sys/swap.h>." 
* commit '16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd':
  SWAP_FLAG_* constants are now in <sys/swap.h>.
 2014-01-08 02:48:40 +00: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 ae998c7117 am 0298da56: am 492b0ca4: am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86." 
* commit '0298da56f410ba0f6a1f1f44deb8e2224f9fc49d':
  Fix the ucontext for mips/x86.
 2014-01-07 23:53:18 +00: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