Commit Graph

17653 Commits

Author SHA1 Message Date
Tom Cherry e8b0fcecf4 Merge "combine adbd.rc with init.usb.rc" 2015-09-04 16:50:46 +00:00
David Pursell 80f67029e0 adb: move shell service to a separate file.
Upcoming changes to the shell will require significant additions to
the subprocess code, and it will be cleaner if it's in a separate file.

The only functional change here is a new debug tag specifically for
the shell service. Everything else has been copied exactly as-is in
order to make it easier to determine what's changing in upcoming CLs.

Change-Id: I13bd4294059051ee10e0d0c6a06affd8eca62967
2015-09-04 08:52:35 -07:00
Mark Salyzyn 52f59f6ead am 79016587: am 0df400ec: Merge "logd: worst uid record watermark part four"
* commit '7901658787e1b7d645f81b24babd1e774482d48d':
  logd: worst uid record watermark part four
2015-09-04 14:34:50 +00:00
Mark Salyzyn 4ee37bc91e logd: worst uid record watermark part four
(cherry pick from commit 831aa29730)

With part deux we caused an apparent regression by not checking for
stale recorded iterators. This checking was on-purpose bypassesed
when leading prune entries were to be deleted without touching the
statistics engine due to an in-place merge.

Part deux had us leaving iterators we were not focussed on untouched
which in turn because they were left behind, had a much higher
likelihood of being deleted without touching the statistics engine.

Perform the check every delete.

Bug: 23789348
Bug: 23490267
Change-Id: Idc6cc23d1f9e3b6cd9a083139a0de59479fbfe08
2015-09-04 14:32:46 +00:00
Mark Salyzyn 7901658787 am 0df400ec: Merge "logd: worst uid record watermark part four"
* commit '0df400ec117f5b97673bafa25545c3294c3af636':
  logd: worst uid record watermark part four
2015-09-04 14:21:33 +00:00
Mark Salyzyn 0df400ec11 Merge "logd: worst uid record watermark part four" 2015-09-04 14:14:02 +00:00
Christopher Ferris f67287b1af am 3fe45103: am d9a06afb: Add a logging handler on timeout.
* commit '3fe4510350294b02a2cab7ae579051ba9bdbbff4':
  Add a logging handler on timeout.
2015-09-04 03:06:33 +00:00
Christopher Ferris 3fe4510350 am d9a06afb: Add a logging handler on timeout.
* commit 'd9a06afb19156b61ee85c975a292d884bba09c7f':
  Add a logging handler on timeout.
2015-09-04 02:56:21 +00:00
Christopher Ferris d9a06afb19 Add a logging handler on timeout.
If the signal handler doesn't fire in the given time when trying to unwind
a thread, put on a logging handler. This prevents crashes if the signal
does eventually fire.

Bug: 23783762

(cherry picked from commit d7226f9a14)

Change-Id: Ib990a06733cc93717752ab4998f4ae26afd7e249
2015-09-03 19:06:06 -07:00
Mark Salyzyn 831aa29730 logd: worst uid record watermark part four
With part deux we caused an apparent regression by not checking for
stale recorded iterators. This checking was on-purpose bypassesed
when leading prune entries were to be deleted without touching the
statistics engine due to an in-place merge.

Part deux had us leaving iterators we were not focussed on untouched
which in turn because they were left behind, had a much higher
likelihood of being deleted without touching the statistics engine.

Perform the check every delete.

Bug: 23789348
Change-Id: Idc6cc23d1f9e3b6cd9a083139a0de59479fbfe08
2015-09-03 17:13:45 -07:00
Tom Cherry 008eb9b80a move uncrypt from init.rc to uncrypt.rc
Move uncrypt from /init.rc to /system/etc/init/uncrypt.rc using the
LOCAL_INIT_RC mechanism

Bug 23186545

Change-Id: Ibd838dd1d250c0e6536e44b69f11fb5ed42ba10b
2015-09-03 16:33:08 -07:00
Tom Cherry 2270dbbc84 combine adbd.rc with init.usb.rc
init.usb.rc and adbd.rc contain similar contents and belong in the same
file.

This file also belongs on the ramdisk as adbd is on the ramdisk, not the
system partition, therefore resolving to keep init.usb.rc in its current
location and combining the contents of adbd.rc is the best approach

Change-Id: I430f8fea58694679e7b8b7be69ce87daadd616f4
2015-09-03 16:19:04 -07:00
Tom Cherry fdc6fbd0c7 am b2acb6b2: am b4998341: Merge "move init.trace.rc to frameworks/native"
* commit 'b2acb6b2ce07bf9e1c944eadcdc2dafe3e41efaf':
  move init.trace.rc to frameworks/native
2015-09-03 22:28:35 +00:00
Tom Cherry b2acb6b2ce am b4998341: Merge "move init.trace.rc to frameworks/native"
* commit 'b499834121854fd98664d8d96734c733f96dbc1f':
  move init.trace.rc to frameworks/native
2015-09-03 22:02:40 +00:00
Tom Cherry b499834121 Merge "move init.trace.rc to frameworks/native" 2015-09-03 21:52:44 +00:00
Elliott Hughes 27e427aaa2 am db31ac76: am 478da637: Merge "Improve adb sync_send error reporting."
* commit 'db31ac76baf732244b9492a96db43fd90070411a':
  Improve adb sync_send error reporting.
2015-09-03 21:41:56 +00:00
Christopher Ferris 9b7f9c4b00 am 7f95fef6: am 825477ff: Merge "Add a logging handler on timeout."
* commit '7f95fef6708212bcd3dbceefd8f0207df18db365':
  Add a logging handler on timeout.
2015-09-03 21:34:41 +00:00
Elliott Hughes db31ac76ba am 478da637: Merge "Improve adb sync_send error reporting."
* commit '478da6374b5f4a5742566edfe3057c674a51615e':
  Improve adb sync_send error reporting.
2015-09-03 21:33:59 +00:00
Christopher Ferris 7f95fef670 am 825477ff: Merge "Add a logging handler on timeout."
* commit '825477ff6bb62bf02654449dc1d9192a23acb81c':
  Add a logging handler on timeout.
2015-09-03 21:26:51 +00:00
Elliott Hughes 478da6374b Merge "Improve adb sync_send error reporting." 2015-09-03 21:25:13 +00:00
Tom Cherry b0d5184774 move init.trace.rc to frameworks/native
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.

Bug 23186545

Change-Id: I55c37d3ff98c9ac10e6c1a713fadc7eb37346195
2015-09-03 14:19:11 -07:00
Christopher Ferris 825477ff6b Merge "Add a logging handler on timeout." 2015-09-03 21:18:23 +00:00
Elliott Hughes c46131a9a2 am 14adafca: am ce98fc40: Merge "Lose ls to toybox."
* commit '14adafca3e351abfd46076bc52804e258238cecb':
  Lose ls to toybox.
2015-09-03 21:17:52 +00:00
Elliott Hughes 14adafca3e am ce98fc40: Merge "Lose ls to toybox."
* commit 'ce98fc40fd5d86a944a2cfe2e993315b670e3bfc':
  Lose ls to toybox.
2015-09-03 21:07:04 +00:00
Elliott Hughes ce98fc40fd Merge "Lose ls to toybox." 2015-09-03 20:58:58 +00:00
Elliott Hughes 081696d27c Improve adb sync_send error reporting.
Bug: http://b/23786900
Change-Id: I71f10de8d767eaf8bf0f5d9b8c304527e2b953ff
2015-09-03 13:55:55 -07:00
Vincent Palatin 3b7995b72e init.usb.rc: fix USB typec property names
Fix typos in the usb typec properties (sys.usb.typec.*),
so the data_role and the power_role can be written properly in the sysfs.

Bug: 23790832
Change-Id: I90f591ab37825a07e0610ef1fec0e831eb19515d
2015-09-03 13:53:04 -07:00
Bill Yi 07ee1fa69a am c3a64d38: am cb6cd44d: Merge "Revert "metricsd: Collect generic stats about the system.""
* commit 'c3a64d38fe3c5b5c45455924d0223f77488f0297':
  Revert "metricsd: Collect generic stats about the system."
2015-09-03 19:44:06 +00:00
Bill Yi c3a64d38fe am cb6cd44d: Merge "Revert "metricsd: Collect generic stats about the system.""
* commit 'cb6cd44d5670ae988349c4a0dc917ff4ca321c11':
  Revert "metricsd: Collect generic stats about the system."
2015-09-03 19:37:19 +00:00
Christopher Ferris d7226f9a14 Add a logging handler on timeout.
If the signal handler doesn't fire in the given time when trying to unwind
a thread, put on a logging handler. This prevents crashes if the signal
does eventually fire.

Bug: 23783762
Change-Id: Ib7abb36b71d079a7043117697c41b535319586fd
2015-09-03 12:27:57 -07:00
Bill Yi cb6cd44d56 Merge "Revert "metricsd: Collect generic stats about the system."" 2015-09-03 19:27:16 +00:00
Bill Yi 6d5822ed7b Revert "metricsd: Collect generic stats about the system."
This reverts commit 90b02cd46d.

Change-Id: I9950c688433e99b0bc4745f02e2f9ae66f3b5578
2015-09-03 19:18:56 +00:00
Yabin Cui 9bbc68dd07 am 7d0b4ada: am 6562c151: Merge "adb: clean up debug tracing a little."
* commit '7d0b4ada0bf539a0f48b00e211799400aa733f4d':
  adb: clean up debug tracing a little.
2015-09-03 18:14:05 +00:00
Bertrand Simonnet e5dbfdbf58 am ef391cb9: am 9cd816b3: Merge "metricsd: Log the histogram name to hash mapping."
* commit 'ef391cb94a645277021b1b43d429611dbfe96666':
  metricsd: Log the histogram name to hash mapping.
2015-09-03 18:14:04 +00:00
Bertrand Simonnet 706c0717f6 am 05b066e9: am c1862479: Merge "metricsd: Collect generic stats about the system."
* commit '05b066e93eadac5642a657379464e19418362e62':
  metricsd: Collect generic stats about the system.
2015-09-03 18:14:03 +00:00
Yabin Cui 7d0b4ada0b am 6562c151: Merge "adb: clean up debug tracing a little."
* commit '6562c1513b2b7bd88da8b1d0c88b89e66b2dcd69':
  adb: clean up debug tracing a little.
2015-09-03 17:38:57 +00:00
Bertrand Simonnet ef391cb94a am 9cd816b3: Merge "metricsd: Log the histogram name to hash mapping."
* commit '9cd816b33d97f1a6427d6e265bbc58eb712178d0':
  metricsd: Log the histogram name to hash mapping.
2015-09-03 17:38:56 +00:00
Bertrand Simonnet 05b066e93e am c1862479: Merge "metricsd: Collect generic stats about the system."
* commit 'c18624799b0dd832c0dd1f70455dd5912605291b':
  metricsd: Collect generic stats about the system.
2015-09-03 17:38:54 +00:00
Yabin Cui 6562c1513b Merge "adb: clean up debug tracing a little." 2015-09-03 17:32:44 +00:00
Bertrand Simonnet 9cd816b33d Merge "metricsd: Log the histogram name to hash mapping." 2015-09-03 17:29:22 +00:00
Bertrand Simonnet c18624799b Merge "metricsd: Collect generic stats about the system." 2015-09-03 17:28:52 +00:00
Jorge Lucangeli Obes efb4bb7820 am fd7a9f79: am 66d32c74: Merge "Use CAP_MASK_LONG for file capabilities."
* commit 'fd7a9f79f2e9f55da0768da2a7cc93ce6a006aa1':
  Use CAP_MASK_LONG for file capabilities.
2015-09-03 16:07:05 +00:00
Jorge Lucangeli Obes fd7a9f79f2 am 66d32c74: Merge "Use CAP_MASK_LONG for file capabilities."
* commit '66d32c7488e12545218e83195738c95c183760ef':
  Use CAP_MASK_LONG for file capabilities.
2015-09-03 15:55:32 +00:00
Jorge Lucangeli Obes 66d32c7488 Merge "Use CAP_MASK_LONG for file capabilities." 2015-09-03 15:48:01 +00:00
Tim Murray c9b308d155 am bb641d5f: am bc8c731a: Add zygote to the foreground cpuset.
* commit 'bb641d5f7714bdb8cd3ecc4f47cdd7c68e75d17a':
  Add zygote to the foreground cpuset.
2015-09-03 06:22:42 +00:00
Ian Pedowitz 72b82fa00d "resolved conflicts for merge of cd7d73fa to mnc-dr-dev-plus-aosp"
Per chat with tomcherry, merge -s ours
2015-09-02 22:32:38 -07:00
Elliott Hughes 25df278b1f am e7c37fb1: am c5d278d4: Merge "metricsd: Remove unused constant."
* commit 'e7c37fb18d4e486ad6fddb52a1f93a71cc2f6b06':
  metricsd: Remove unused constant.
2015-09-03 04:29:35 +00:00
Badhri Jagan Sridharan b081b8cdd1 am ddc296e8: am e1801863: init: usb: Add init scripts for configfs commands
* commit 'ddc296e841fa98bc89c0459d1dd3e438c790f15d':
  init: usb: Add init scripts for configfs commands
2015-09-03 04:23:16 +00:00
Badhri Jagan Sridharan 1c791dfd3d am 723b410f: am 48d59acc: init.usb.rc: Add new system property for configfs
* commit '723b410ff50920cea270b282c19edcfaf6f444e2':
  init.usb.rc: Add new system property for configfs
2015-09-03 04:23:15 +00:00
Tim Murray adef754b45 am 25a1b489: am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-dev
* commit '25a1b4894d9fc249535f0e0b3851643eb172202f':
  Add foreground/boost cpuset.
2015-09-03 04:22:24 +00:00