Commit graph

7519 commits

Author SHA1 Message Date
Christopher Ferris
cc98fd7eb2 am ab2de415: am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."
* commit 'ab2de41574d15bac8c3ef8f49cfba493ea501a0a':
  Fix global pointing to local variable.
2014-01-29 12:49:39 +00:00
Kristian Monsen
f6b714ba61 am da0d5bd1: am a40636f3: am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"
* commit 'da0d5bd147dfd87280b1924abfc3650d5306448d':
  Fix code style, put unused in the end
2014-01-29 12:20:41 +00:00
Christopher Ferris
96a0bf1e94 am 36a4e408: am aaf89887: am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."
* commit '36a4e4085e55048ee2a78c7d5b50f7395e547fa2':
  Re-enable libunwind for arm.
2014-01-29 12:19:59 +00:00
Christopher Ferris
ab2de41574 am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."
* commit '773c9ab74cc2e42f25fe16756e0b7a693b1d2cf5':
  Fix global pointing to local variable.
2014-01-29 08:15:40 +00:00
Christopher Ferris
773c9ab74c am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."
* commit 'c96c29548fa0c933e5aa78116f90ff6be5c4fc39':
  Fix global pointing to local variable.
2014-01-29 08:11:02 +00:00
Christopher Ferris
c96c29548f am a152ed73: Merge "Fix global pointing to local variable."
* commit 'a152ed734f179ee2748d306f2eb57acbb4df1ace':
  Fix global pointing to local variable.
2014-01-29 08:07:27 +00:00
Christopher Ferris
a152ed734f Merge "Fix global pointing to local variable." 2014-01-29 06:29:58 +00:00
Christopher Ferris
2b4ae52a56 Fix global pointing to local variable.
Change-Id: I933cbb680ca6310c13634f09a9827077c8dbd568
2014-01-28 22:21:14 -08:00
Kristian Monsen
da0d5bd147 am a40636f3: am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"
* commit 'a40636f33fe4f2dbd99e58c98609445ecf5870b8':
  Fix code style, put unused in the end
2014-01-28 22:33:22 +00:00
Kristian Monsen
a40636f33f am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"
* commit '5abe06bf8bfed0c15dc56b6d2cd30cc10c898153':
  Fix code style, put unused in the end
2014-01-28 22:28:08 +00:00
Kristian Monsen
5abe06bf8b am 6e34793b: Merge "Fix code style, put unused in the end"
* commit '6e34793b9cf11237670a5daa320cd784f7442532':
  Fix code style, put unused in the end
2014-01-28 22:25:15 +00:00
Kristian Monsen
6e34793b9c Merge "Fix code style, put unused in the end" 2014-01-28 22:18:00 +00:00
Mark Salyzyn
8e4cdc1e86 resolved conflicts for merge of 3a5f3050 to master
Change-Id: I87f51ba0dcc8187a3e620fab96c078e6614b28a2
2014-01-28 13:51:46 -08:00
Christopher Ferris
36a4e4085e am aaf89887: am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."
* commit 'aaf898877c4225f939b27ca48bb5f474fc9b46ae':
  Re-enable libunwind for arm.
2014-01-28 21:37:20 +00:00
Christopher Ferris
aaf898877c am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."
* commit '6fe31b2f830309c2a8e0035c07b6b2bb44e081c9':
  Re-enable libunwind for arm.
2014-01-28 21:35:25 +00:00
Christopher Ferris
6fe31b2f83 am d391c9b4: Merge "Re-enable libunwind for arm."
* commit 'd391c9b4acb2bcd6cec048075e728d3aee6a0d6f':
  Re-enable libunwind for arm.
2014-01-28 21:29:51 +00:00
Christopher Ferris
d391c9b4ac Merge "Re-enable libunwind for arm." 2014-01-28 21:23:50 +00:00
Mark Salyzyn
3a5f305062 am 7b9bb36a: am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* commit '7b9bb36ade6c8fa2e77416143847b019ddda9e95': (29 commits)
  libsysutils: SocketListener export release
  libsysutils: Add iovec/runOnEachSocket
  liblog: support struct logger_event_v2 format
  liblog: update timestamp on NOTICE file
  libcutils: resolve warning in iosched_policy.c
  liblog: Add const pedantics
  logcat: Add -T flag (-t w/o assumption of -d)
  logcat: Add logcat test suite
  liblog: Add cpu utilization test
  liblog: Add liblog test suite
  debuggerd: Support newline split in log messages
  liblog: deprecate export LOGGER ioctl definitions
  liblog: deprecate export of LOGGER_LOG_* defines
  liblog: Add README
  liblog: resolve build warning messages
  liblog: high CPU usage from logcat
  liblog: fix build again
  liblog: drop use of sys/cdefs.h
  liblog: git_master@964770 build problem
  logcat: Incorporate liblog reading API
  ...
2014-01-28 21:20:39 +00:00
Nick Kralevich
8ca9400c0a am f2869381: am 11322efd: am acd96b11: am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."
* commit 'f286938177390ec058ea39b308c9b9498b011c7c':
  Move restorecon and restorecon_recursive code to libselinux.
2014-01-28 21:19:32 +00:00
Kristian Monsen
7ddca5adb6 Fix code style, put unused in the end
Change-Id: I7315b35049924d5067203a432584b8f29e5a1391
2014-01-28 13:19:11 -08:00
Mark Salyzyn
7b9bb36ade am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* commit '0256e1f68bb8af10478b690c8fb772a0ec2027e3': (29 commits)
  libsysutils: SocketListener export release
  libsysutils: Add iovec/runOnEachSocket
  liblog: support struct logger_event_v2 format
  liblog: update timestamp on NOTICE file
  libcutils: resolve warning in iosched_policy.c
  liblog: Add const pedantics
  logcat: Add -T flag (-t w/o assumption of -d)
  logcat: Add logcat test suite
  liblog: Add cpu utilization test
  liblog: Add liblog test suite
  debuggerd: Support newline split in log messages
  liblog: deprecate export LOGGER ioctl definitions
  liblog: deprecate export of LOGGER_LOG_* defines
  liblog: Add README
  liblog: resolve build warning messages
  liblog: high CPU usage from logcat
  liblog: fix build again
  liblog: drop use of sys/cdefs.h
  liblog: git_master@964770 build problem
  logcat: Incorporate liblog reading API
  ...
2014-01-28 21:18:01 +00:00
Mark Salyzyn
0256e1f68b am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* commit 'd2acdd82e613b3e1d79a00943ac3bf5fbc14a766': (29 commits)
  libsysutils: SocketListener export release
  libsysutils: Add iovec/runOnEachSocket
  liblog: support struct logger_event_v2 format
  liblog: update timestamp on NOTICE file
  libcutils: resolve warning in iosched_policy.c
  liblog: Add const pedantics
  logcat: Add -T flag (-t w/o assumption of -d)
  logcat: Add logcat test suite
  liblog: Add cpu utilization test
  liblog: Add liblog test suite
  debuggerd: Support newline split in log messages
  liblog: deprecate export LOGGER ioctl definitions
  liblog: deprecate export of LOGGER_LOG_* defines
  liblog: Add README
  liblog: resolve build warning messages
  liblog: high CPU usage from logcat
  liblog: fix build again
  liblog: drop use of sys/cdefs.h
  liblog: git_master@964770 build problem
  logcat: Incorporate liblog reading API
  ...
2014-01-28 21:13:55 +00:00
Mark Salyzyn
d2acdd82e6 Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* changes:
  libsysutils: SocketListener export release
  libsysutils: Add iovec/runOnEachSocket
  liblog: support struct logger_event_v2 format
  liblog: update timestamp on NOTICE file
  libcutils: resolve warning in iosched_policy.c
  liblog: Add const pedantics
  logcat: Add -T flag (-t w/o assumption of -d)
  logcat: Add logcat test suite
  liblog: Add cpu utilization test
  liblog: Add liblog test suite
  debuggerd: Support newline split in log messages
  liblog: deprecate export LOGGER ioctl definitions
  liblog: deprecate export of LOGGER_LOG_* defines
  liblog: Add README
  liblog: resolve build warning messages
  liblog: high CPU usage from logcat
  liblog: fix build again
  liblog: drop use of sys/cdefs.h
  liblog: git_master@964770 build problem
  logcat: Incorporate liblog reading API
  debuggerd: Incorporate liblog reading API
  liblog: Interface to support abstracting log read
  adb: deprecate legacy log service interface
  adb: regression from Move list.c to inlines
  liblog: whitespace cleanup
  libcutils: bug str_parms.c:str_parms_get_float().
  libcutils: UNUSED argument warnings
  libsysutils: Get rid of warnings
  libcutils: Move list.c to inlines on list.h
2014-01-28 21:09:37 +00:00
Nick Kralevich
f286938177 am 11322efd: am acd96b11: am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."
* commit '11322efdc63003ba7e2ba73dbbb2621e916a3773':
  Move restorecon and restorecon_recursive code to libselinux.
2014-01-28 21:07:13 +00:00
Nick Kralevich
11322efdc6 am acd96b11: am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."
* commit 'acd96b11189e0422fa4060bc29139fbfef5b14a8':
  Move restorecon and restorecon_recursive code to libselinux.
2014-01-28 21:04:28 +00:00
Nick Kralevich
acd96b1118 am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."
* commit '12db3eb6db3b80011043e404530012612a1d0fbf':
  Move restorecon and restorecon_recursive code to libselinux.
2014-01-28 21:02:57 +00:00
Nick Kralevich
12db3eb6db Merge "Move restorecon and restorecon_recursive code to libselinux." 2014-01-28 20:57:37 +00:00
Kristian Monsen
35f6c3aed9 am 58a9cd16: am 97ea590b: am 9aaba5ca: am 8c6b9b0d: Merge "Fixes some warnings"
* commit '58a9cd1681688e031ef0642842d326da7d2a4934':
  Fixes some warnings
2014-01-28 20:21:36 +00:00
Kristian Monsen
58a9cd1681 am 97ea590b: am 9aaba5ca: am 8c6b9b0d: Merge "Fixes some warnings"
* commit '97ea590b4f55c1ee3998d1f17c06a7e7a27821e8':
  Fixes some warnings
2014-01-28 20:05:46 +00:00
Christopher Ferris
df2906186b Re-enable libunwind for arm.
Update to handle the new optimized way that libunwind works.

In addition, a small refactor of the BacktraceMap code.

A few new tests of for good measure.

Change-Id: I2f9b4f5ad5a0dfe907b31febee76e4b9b94fb76f
2014-01-28 12:03:36 -08:00
Kristian Monsen
97ea590b4f am 9aaba5ca: am 8c6b9b0d: Merge "Fixes some warnings"
* commit '9aaba5cad1197a16c6af13bca76fbc95eeb25ca7':
  Fixes some warnings
2014-01-28 20:02:19 +00:00
Kristian Monsen
9aaba5cad1 am 8c6b9b0d: Merge "Fixes some warnings"
* commit '8c6b9b0d95974be3ba21c133661772206bc15e39':
  Fixes some warnings
2014-01-28 19:57:33 +00:00
Kristian Monsen
8c6b9b0d95 Merge "Fixes some warnings" 2014-01-28 19:33:12 +00:00
Kristian Monsen
b5a9890f90 Fixes some warnings
- Implicit decleared function
- Unused variable

Change-Id: Ia701e66682cb6788f0716a2ef7556ed07227f78f
2014-01-28 11:28:32 -08:00
Stephen Smalley
dbd37f2e1d Move restorecon and restorecon_recursive code to libselinux.
This requires telling libselinux to use the sehandle already
obtained by init rather than re-acquiring it internally.  init
retains ownership of the sehandle because it performs the
initial load, uses the sehandle for other purposes (e.g. labeling
of directories created via mkdir and labeling of socket files),
and handles the policy reload property trigger.

Change-Id: I4a380caab7f8481c33eb64fcdb16b6cabe918ebd
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-01-28 10:42:24 -05:00
Benoit Goby
1dc8d76f79 am 119dbff9: am bbc92ee7: am 68a74ec4: am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"
* commit '119dbff9c18453c9d91189424e44b3dcdf9bb82b':
  adbd: Don't close/reopen FFS ep0 on disconnect
2014-01-28 01:04:57 +00:00
Benoit Goby
119dbff9c1 am bbc92ee7: am 68a74ec4: am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"
* commit 'bbc92ee7e4d05571e734022894afa2236ccbf9a4':
  adbd: Don't close/reopen FFS ep0 on disconnect
2014-01-28 00:59:16 +00:00
Benoit Goby
bbc92ee7e4 am 68a74ec4: am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"
* commit '68a74ec483db4317de0e309eb63d846009b018e9':
  adbd: Don't close/reopen FFS ep0 on disconnect
2014-01-28 00:54:34 +00:00
Benoit Goby
68a74ec483 am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"
* commit '6ddabb7a1cc3080ae773acb045f69b5e6afee87a':
  adbd: Don't close/reopen FFS ep0 on disconnect
2014-01-28 00:43:37 +00:00
Benoit Goby
6ddabb7a1c Merge "adbd: Don't close/reopen FFS ep0 on disconnect" 2014-01-28 00:07:15 +00:00
Mark Salyzyn
44b99c22af libsysutils: SocketListener export release
* Foreground thread (legacy) closes connection by
  reporting false return value for onDataAvailable.
* Background thread can choose instead to close the
  connection asynchronously by calling release, must
  return true for the onDataAvailable method.

(cherry picked from commit d7ad4e409e)

Change-Id: I70ab37d5c22b02804aa3b4dfb26cc9b75291f8b6
2014-01-27 15:22:49 -08:00
Mark Salyzyn
23f04107dc libsysutils: Add iovec/runOnEachSocket
SocketClient:
* Replace sendDataLocked with sendDataLockedv which takes an iovec.
* Add a version of sendData, sendDatav, which takes an iovec.
* do not preserve iovec content through sendDatav

SocketListener:
* Add runOnEachSocket, which allows to to specify a SocketClientCommand to
  run individually on each socket. This allows you to do broadcast-like
  actions customized for each individual socket.
* Client safe list reference counting for sendBroadcast & runOnEach Socket

(cherry picked from commit a6e965578e)

Signed-off-by: Nick Kralevich <nnk@google.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>

Change-Id: I716f89c01b4cb7af900045c7e41fac1492defb06
2014-01-27 15:22:04 -08:00
Mark Salyzyn
40b21558e5 liblog: support struct logger_event_v2 format
(cherry picked from commit c176e14ce3)

Change-Id: I34c96adffab3478dae8f5a2597a840caad5092cc
2014-01-27 15:21:29 -08:00
Mark Salyzyn
e7ff525a7e liblog: update timestamp on NOTICE file
(cherry picked from commit b69e092dc7)

Change-Id: I776509232aaa50e14fe79e45ab133c0ea3985933
2014-01-27 15:20:59 -08:00
Mark Salyzyn
3bca606117 libcutils: resolve warning in iosched_policy.c
(cherry picked from commit 407038cd93)

Change-Id: I35b0d1eeba21cc1ed9645a5acfa180ed20797c56
2014-01-27 15:20:23 -08:00
Mark Salyzyn
318bb72601 liblog: Add const pedantics
(cherry picked from commit 9e03ce45f9)

Change-Id: I819695b778ac08fcfc9b1a87f3f86e5715f53084
2014-01-27 15:19:53 -08:00
Mark Salyzyn
5d3d1f17db logcat: Add -T flag (-t w/o assumption of -d)
(cherry picked from commit de02546e3d)

Change-Id: I49763e2db83755e0b7b12dfa3f83a3957c54d389
2014-01-27 15:19:17 -08:00
Mark Salyzyn
65772ca7d7 logcat: Add logcat test suite
(cherry picked from commit 2807db9a26)

Change-Id: Ic4c84b88b8d899965c9765bdc3ee223ef73ba7d1
2014-01-27 15:18:49 -08:00
Mark Salyzyn
cef098ef5d liblog: Add cpu utilization test
- followup to measure CPU utilization in liblog to
  ensure this issue gets caught before a regression
  passes into the labs. Threshold for failure is 1%.

(cherry picked from commit edadb2e719)

BUG: 12457855
Change-Id: I40568a72aeef2f554b19ad55f3dd3c02bc023f24
2014-01-27 15:18:09 -08:00
Mark Salyzyn
819c58a8ca liblog: Add liblog test suite
(cherry picked from commit 8d1fdb5093)

Change-Id: Ia457d518b4e7ff37e840336ff0c48583709700d4
2014-01-27 15:17:39 -08:00