Commit Graph

8577 Commits

Author SHA1 Message Date
Colin Cross d7d9b6fcaa am f02fd9f0: am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"
* commit 'f02fd9f0b061d29bb872664479ed4a5949d23ac9':
  adb: Add USB vendor ID for Honeywell
2014-06-19 15:44:14 +00:00
Colin Cross f02fd9f0b0 am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"
* commit '5e504a4e64824e3e7132b2e4b3f68c02f417466e':
  adb: Add USB vendor ID for Honeywell
2014-06-19 15:40:59 +00:00
Colin Cross 08c704a0fe am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"
* commit '1a9e9c203bd2240e7b7768c74c5da1bcf107f159':
  Use inet_ntoa to display ipaddr and mask values
2014-06-19 00:52:40 +00:00
Colin Cross 1a9e9c203b am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"
* commit '974a4f3e00861da9aa1301efd5c349c3e2a5cf07':
  Use inet_ntoa to display ipaddr and mask values
2014-06-19 00:49:10 +00:00
Colin Cross 974a4f3e00 Merge "Use inet_ntoa to display ipaddr and mask values" 2014-06-19 00:18:04 +00:00
Bhanu Chetlapalli 9875ee97c7 Use inet_ntoa to display ipaddr and mask values
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Iee72a6b987e4ec1c720e925b59e9e2631ae978e5
2014-06-18 17:24:04 -07:00
Ying Wang fd9cfb4c22 am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
* commit '68d97430dd2cc25bb753df748d859415520a7dcb':
  Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
2014-06-18 23:03:48 +00:00
Ying Wang 68d97430dd am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
* commit '4924d10ae04574a15d94c6812153321af59a3e5b':
  Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
2014-06-18 22:59:02 +00:00
Colin Cross 5e504a4e64 Merge "adb: Add USB vendor ID for Honeywell" 2014-06-18 22:47:59 +00:00
DanielMo 8c4c8e8988 adb: Add USB vendor ID for Honeywell
Change-Id: Ib92eca23a6c75ec9323bb1b0e7d7f8cd5f9ca207
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-06-19 16:02:14 +08:00
Mark Salyzyn 4700dfa0fb am 8d782f51: am 3f55d2f4: Merge "logcat: test: modernize"
* commit '8d782f5170960f023a77be656e60398390aa58aa':
  logcat: test: modernize
2014-06-18 20:45:43 +00:00
Mark Salyzyn 8d782f5170 am 3f55d2f4: Merge "logcat: test: modernize"
* commit '3f55d2f4e69dd155d558fc2aa38e6f9bb0900152':
  logcat: test: modernize
2014-06-18 20:42:26 +00:00
Nick Kralevich 4224edf51d am 89e4fad0: am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"
* commit '89e4fad09e1ae765ab0be1580a468bc0837ef7e4':
  adbd: unconditionally call setgroups
2014-06-18 20:07:54 +00:00
Nick Kralevich 89e4fad09e am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"
* commit '4e6aa6a227401d8b56c9b149719b1e0de6afd6e8':
  adbd: unconditionally call setgroups
2014-06-18 20:05:41 +00:00
Mark Salyzyn 2757d76cd6 am deae968a: am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"
* commit 'deae968a2c6384531d208f00f27085f5d725989f':
  logd: Allow apps to clear their UID-specific data
2014-06-18 19:19:32 +00:00
Mark Salyzyn 9f621cf872 am 6bda7716: am 9e7bef0e: Merge changes I759c65e8,I97699037
* commit '6bda7716405f3ddc8571c578beaaac4368c840d0':
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-18 19:19:31 +00:00
Mark Salyzyn deae968a2c am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"
* commit '4da93e34388748879a25974ee33ff1eb6cc47cd2':
  logd: Allow apps to clear their UID-specific data
2014-06-18 19:16:04 +00:00
Mark Salyzyn 6bda771640 am 9e7bef0e: Merge changes I759c65e8,I97699037
* commit '9e7bef0ef91e819a11ceb8b14489cb451970e62e':
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-18 19:16:03 +00:00
Elliott Hughes d478aec2a9 am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit 'bd80e0d8e6de5c2d4fbd2e8a1bc750dc6e0b7e20':
  Changed maps output in debuggerd.
2014-06-17 22:58:11 +00:00
Elliott Hughes bd80e0d8e6 am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit '0ef3fa24fb0c3c58b8440527e4de4f3f98ddaaa5':
  Changed maps output in debuggerd.
2014-06-17 22:52:46 +00:00
Nick Kralevich 4e6aa6a227 Merge "adbd: unconditionally call setgroups" 2014-06-17 21:47:03 +00:00
Nick Kralevich e5cbf4e044 adbd: unconditionally call setgroups
We should ensure that the appropriate supplementary groups are
set, regardless of whether we're running UID=0 or UID=shell.

Change-Id: I3a1624a574102be08176a41f9c7eb5f82af2b3e5
2014-06-18 11:24:27 -07:00
Mark Salyzyn 4da93e3438 Merge "logd: Allow apps to clear their UID-specific data" 2014-06-17 21:47:03 +00:00
Ying Wang 4924d10ae0 Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed." 2014-06-17 21:42:00 +00:00
Ying Wang 2359b3c162 Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
(cherry picked from commit 7011a85606)

Change-Id: I025fe1f64c87fd406b3a3bf3d20fd3b78be8a940
2014-06-18 15:43:29 -07:00
Mark Salyzyn 3f55d2f4e6 Merge "logcat: test: modernize" 2014-06-17 21:42:00 +00:00
Mark Salyzyn 9879ac8e12 logcat: test: modernize
- split sequential sort output test out as a benchmark check
- Allow up to two failures of sort results because of occasional reader locks.
- logcat -g output was changed to handle wider set of values incorporating a
  multiplier for UX, and would not pass test if 'logcat -G 1M' was run.
- If spam filter is turned off, prune checks would fail, allowed for an
  empty default.

Change-Id: I06d6089e18279df7525d1c16a1f76b3125ddbf05
2014-06-18 13:18:17 -07:00
Mark Salyzyn 9e7bef0ef9 Merge changes I759c65e8,I97699037
* changes:
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-17 21:42:00 +00:00
Mark Salyzyn 6e9aaae9ed logd: test: deal with spam filter turned off
Change-Id: I759c65e869d0c7cd81063fa7993ba3d67ef9cd06
2014-06-18 11:12:27 -07:00
Mark Salyzyn 0c57bd864d logd: test: modernize
- Correct default tense for kernel or user logger
- harden code that parses the benchmark data
- give more meaning to the spam filter test

Change-Id: I97699037ca9d56718f53f08d22be79092fb431de
2014-06-18 11:12:27 -07:00
Elliott Hughes 6419687fe0 am 929c7fe1: am 5bc6b5b8: Merge "Fixed logcat debug output issue."
* commit '929c7fe179dc8c7ca0e0f0268ffb1213d0c929f4':
  Fixed logcat debug output issue.
2014-06-17 21:35:40 +00:00
Elliott Hughes 929c7fe179 am 5bc6b5b8: Merge "Fixed logcat debug output issue."
* commit '5bc6b5b804546c683953393441e697e0eb84ac48':
  Fixed logcat debug output issue.
2014-06-17 21:30:24 +00:00
Elliott Hughes 0ef3fa24fb Merge "Changed maps output in debuggerd." 2014-06-17 20:56:23 +00:00
Brigid Smith 7b2078eeb4 Changed maps output in debuggerd.
Now the map output is only sent to the tombstone, and the entire
contents of /prod/$PID/maps is logged, not just 3 lines.  Additionally,
crasher now supports "crasher SIGSEGV-non-null", which attempts to write to a
dereferenced function address, causing a SIGSEGV at a non-zero address.
This new crasher mode can be used to test the new maps output.

Bug: 15343662
Change-Id: I796d92e8352a6b9714bbbfe96f3143c56565ef2f
2014-06-17 15:32:22 -07:00
Elliott Hughes 5bc6b5b804 Merge "Fixed logcat debug output issue." 2014-06-17 20:56:23 +00:00
Brigid Smith 1babede38b Fixed logcat debug output issue.
Change-Id: Ibeb048b683ec11b05af23371e5e4b17cdd50fea0
2014-06-17 14:24:43 -07:00
Ian Rogers 4436749284 am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."
* commit '4ac17e3b1979f3dcdc2b515fc9d1f349f1b21da6':
  Enable host multilib for ART testing.
2014-06-17 18:53:03 +00:00
Ian Rogers 4ac17e3b19 am 4dfe6faa: Merge "Enable host multilib for ART testing."
* commit '4dfe6faa932e255413dc4dbbaada7e19dd01efd4':
  Enable host multilib for ART testing.
2014-06-17 18:48:51 +00:00
Nick Kralevich 545c6599fa am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."
* commit 'a029d14d03ecc9bde97b9394298c5123c14be081':
  Extend ueventd to use the label-by-symlink support in libselinux.
2014-06-17 18:48:30 +00:00
Nick Kralevich a029d14d03 am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."
* commit '2af91ffb6c5f93ecbc322183c755bb249edc2488':
  Extend ueventd to use the label-by-symlink support in libselinux.
2014-06-17 18:44:18 +00:00
Ian Rogers 4dfe6faa93 Merge "Enable host multilib for ART testing." 2014-06-17 03:56:33 +00:00
Ian Rogers 5af80aa119 Enable host multilib for ART testing.
Change-Id: Ic3ae5122eba13565fb5a4cb1bd0e7e465fb2140c
2014-06-17 01:50:25 -07:00
Nick Kralevich 2af91ffb6c Merge "Extend ueventd to use the label-by-symlink support in libselinux." 2014-06-17 03:56:33 +00:00
Elliott Hughes 96021e03d6 am e3c2e761: am 46a97883: Merge "Changing how debuggerd filters log messages to different locations."
* commit 'e3c2e761ffb9de62dd277673a6c9a486362cef8b':
  Changing how debuggerd filters log messages to different locations.
2014-06-16 21:51:19 +00:00
Elliott Hughes e3c2e761ff am 46a97883: Merge "Changing how debuggerd filters log messages to different locations."
* commit '46a97883e7eb12fa00946f8ba6eb578e6514ea1c':
  Changing how debuggerd filters log messages to different locations.
2014-06-16 21:47:02 +00:00
Elliott Hughes 46a97883e7 Merge "Changing how debuggerd filters log messages to different locations." 2014-06-16 19:18:38 +00:00
Brigid Smith 62ba489ba0 Changing how debuggerd filters log messages to different locations.
The system by which debuggerd filters its output to different locations
is now based on an enum called logtype with easy to understand
categories for log messages (like THREAD, MEMORY, etc.) instead of the
old, fairly esoteric scope_flags variable.  Now much of the output that
previously went to logcat does not show up on the screen, but all output
can be found in the tombstone file.  In addition, the tombstone's
location is now printed so it can be located easily.

Bug: 15341747
Change-Id: Ia2f2051d1dfdea934d0e6ed220f24345e35ba6a2
2014-06-16 14:41:21 -07:00
Elliott Hughes cd0d593569 am 6c65cd5d: am 60218f19: Merge "Add gionee USB vendor id."
* commit '6c65cd5db84361c66983903638ddb251762f9151':
  Add gionee USB vendor id.
2014-06-16 17:41:49 +00:00
Elliott Hughes 6c65cd5db8 am 60218f19: Merge "Add gionee USB vendor id."
* commit '60218f19c94a12ab38444dc598cbb8f8db1f72ca':
  Add gionee USB vendor id.
2014-06-16 17:36:48 +00:00
Elliott Hughes 60218f19c9 Merge "Add gionee USB vendor id." 2014-06-16 15:34:52 +00:00