Commit graph

18409 commits

Author SHA1 Message Date
Sergio Giro
df5151d30f libutils: add test for String8
Test crashes with SIGSEGV without the fix in b/23290056, passes otherwise.

Bug: 23290056
Change-Id: I6daca0aa07b5e97b004a9606a0227227fae11896
2015-09-07 17:12:45 +01:00
David Pursell
ce92d9dba0 am beb81f48: am 9432e753: am da0b0116: Merge "Revert "adb: create shell protocol class.""
* commit 'beb81f48d8eacdb9e29e369a911c1195e5c7a76d':
  Revert "adb: create shell protocol class."
2015-09-06 23:10:33 +00:00
David Pursell
d7b77e236d am 04aa4934: am 74b6e8ec: am e4c1bb53: Merge "adb: features passes transport features."
* commit '04aa49346a015e179dff7a28853380eb0f4424fa':
  adb: `features` passes transport features.
2015-09-06 23:09:21 +00:00
David Pursell
f7f0b3db18 am 897baffb: am 3f742914: am 21541531: Merge changes from topic \'adb_shell_prework\'
* commit '897baffb759e2c6300ad59fef24bfc0b10387a99':
  adb: create shell protocol class.
  adb: refactor subprocess code.
  adb: move shell service to a separate file.
2015-09-06 23:09:07 +00:00
Mark Salyzyn
e215d15557 am 7c15f879: am 65ad3b8b: am f1833245: Merge "logd: worst uid record watermark part four" into mnc-dr-dev
* commit '7c15f879449e638d1d262513c0f0c39203c19938':
  logd: worst uid record watermark part four
2015-09-06 23:08:16 +00:00
Vincent Palatin
d22aaaac09 am 2a048110: am 100de590: am 5e294902: Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev
* commit '2a0481109baaa8385bd9e43a95eac24cd6f89e43':
  init.usb.rc: fix USB typec property names
2015-09-06 23:07:26 +00:00
David Pursell
beb81f48d8 am 9432e753: am da0b0116: Merge "Revert "adb: create shell protocol class.""
* commit '9432e7538ac5ce57a0701bfe274b3eab8589544e':
  Revert "adb: create shell protocol class."
2015-09-06 02:41:35 +00:00
David Pursell
9432e7538a am da0b0116: Merge "Revert "adb: create shell protocol class.""
* commit 'da0b0116ba676203328906608a78dd240e0fea48':
  Revert "adb: create shell protocol class."
2015-09-06 02:38:35 +00:00
David Pursell
da0b0116ba Merge "Revert "adb: create shell protocol class."" 2015-09-06 02:34:02 +00:00
David Pursell
d9b74192b8 Revert "adb: create shell protocol class."
This CL broke the mac build. I'll revert for now and take a look at how to get it working next week.

This reverts commit 73096f2e1d.

Change-Id: Icb3e015250bcbbc69a45675a1358699ebe01e77b
2015-09-06 01:18:47 +00:00
David Pursell
04aa49346a am 74b6e8ec: am e4c1bb53: Merge "adb: features passes transport features."
* commit '74b6e8ecfdb4e7f46d53f174e8ba21ce74f90482':
  adb: `features` passes transport features.
2015-09-05 00:16:00 +00:00
David Pursell
897baffb75 am 3f742914: am 21541531: Merge changes from topic \'adb_shell_prework\'
* commit '3f742914b1dd66bdf172059fc7c4bf421e3a87a6':
  adb: create shell protocol class.
  adb: refactor subprocess code.
  adb: move shell service to a separate file.
2015-09-05 00:08:33 +00:00
David Pursell
74b6e8ecfd am e4c1bb53: Merge "adb: features passes transport features."
* commit 'e4c1bb53068db184ee4cb19513ffe7764a09722f':
  adb: `features` passes transport features.
2015-09-05 00:07:54 +00:00
David Pursell
e4c1bb5306 Merge "adb: features passes transport features." 2015-09-05 00:01:27 +00:00
David Pursell
3f742914b1 am 21541531: Merge changes from topic \'adb_shell_prework\'
* commit '215415318d8483d648955b72bb3b083e131cb62e':
  adb: create shell protocol class.
  adb: refactor subprocess code.
  adb: move shell service to a separate file.
2015-09-05 00:01:02 +00:00
David Pursell
215415318d Merge changes from topic 'adb_shell_prework'
* changes:
  adb: create shell protocol class.
  adb: refactor subprocess code.
  adb: move shell service to a separate file.
2015-09-04 23:54:19 +00:00
David Pursell
880be434a9 adb: features passes transport features.
`adb features` previously returned a list of host features which was
not terribly useful. This CL changes functionality to return the
transport features instead using the standard targeting args:
  $ adb features  # default target.
  $ adb -e features
  $ adb -s 123456 features

Also adds a "check-feature" service which is currently unused but will
allow the adb client to easily check for a specific feature.

Bug: http://b/23824036
Change-Id: Ibc0c420c75f73d363f3bba7705af616ba2059348
2015-09-04 16:47:21 -07:00
Mark Salyzyn
7c15f87944 am 65ad3b8b: am f1833245: Merge "logd: worst uid record watermark part four" into mnc-dr-dev
* commit '65ad3b8b93f0403ad06e2ff618ed886af67da864':
  logd: worst uid record watermark part four
2015-09-04 22:13:46 +00:00
Mark Salyzyn
65ad3b8b93 am f1833245: Merge "logd: worst uid record watermark part four" into mnc-dr-dev
* commit 'f1833245e9a77aae9320af90c18d41aec9c42718':
  logd: worst uid record watermark part four
2015-09-04 22:07:51 +00:00
Mark Salyzyn
f1833245e9 Merge "logd: worst uid record watermark part four" into mnc-dr-dev 2015-09-04 21:50:35 +00:00
Vincent Palatin
2a0481109b am 100de590: am 5e294902: Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev
* commit '100de590e7f82e1039eebc10e60ea554deeb1c3f':
  init.usb.rc: fix USB typec property names
2015-09-04 20:06:28 +00:00
Vincent Palatin
100de590e7 am 5e294902: Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev
* commit '5e29490203c1f83fbdb4bbc68227ab5b7cc14681':
  init.usb.rc: fix USB typec property names
2015-09-04 19:59:02 +00:00
Vincent Palatin
5e29490203 Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev 2015-09-04 19:41:04 +00:00
David Pursell
73096f2e1d adb: create shell protocol class.
Adds a new class ShellProtocol to help read and write data with
`adb shell`. This will allow splitting streams and sending out-of-band
data such as exit codes.

Nothing uses the new class yet except the unit tests.

Bug: http://b/23030641

Change-Id: Ieb02e127095c6dda25b7cb188a2e599173fd97e6
2015-09-04 11:30:11 -07:00
David Pursell
a932058504 adb: refactor subprocess code.
Refactor shell_service.cpp to remove dependencies on service.cpp and
combine some common logic between PTY and raw subprocesses.

This will make it easier to add additional common code paths for
the upcoming shell protocol.

Change-Id: I497d30dd388de61b6e68d9086dce38f33dd92876
2015-09-04 11:18:51 -07:00
Tom Cherry
4c5d655e3d am 4bc10de9: am cd1a65b6: am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"
* commit '4bc10de99f3f84b89b40c46203cbc051224f931d':
  move uncrypt from init.rc to uncrypt.rc
2015-09-04 18:13:00 +00:00
Tom Cherry
fd53a3bf82 am c74403b4: am b00a8a06: am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"
* commit 'c74403b4c9c8acae326b39f06905a3a291a5471f':
  combine adbd.rc with init.usb.rc
2015-09-04 18:12:58 +00:00
Tom Cherry
4bc10de99f am cd1a65b6: am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"
* commit 'cd1a65b69ad2da81e654adab8edeead457a1b1f5':
  move uncrypt from init.rc to uncrypt.rc
2015-09-04 18:02:34 +00:00
Tom Cherry
c74403b4c9 am b00a8a06: am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"
* commit 'b00a8a066f5b6ae5b8d0c03ee7f680389b38a260':
  combine adbd.rc with init.usb.rc
2015-09-04 18:02:32 +00:00
Tom Cherry
cd1a65b69a am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"
* commit '30c13c4954a959c2e6c5ba126f26d88b2e56be61':
  move uncrypt from init.rc to uncrypt.rc
2015-09-04 17:56:27 +00:00
Tom Cherry
b00a8a066f am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"
* commit 'e8b0fcecf4a17cf37b5fefbcceef0920788f776e':
  combine adbd.rc with init.usb.rc
2015-09-04 17:56:25 +00:00
Tom Cherry
30c13c4954 Merge "move uncrypt from init.rc to uncrypt.rc" 2015-09-04 16:51:30 +00:00
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
daa816db02 am 52f59f6e: am 79016587: am 0df400ec: Merge "logd: worst uid record watermark part four"
* commit '52f59f6ead4ace254abcbecc35ab2521b75c126c':
  logd: worst uid record watermark part four
2015-09-04 14:44:53 +00: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
Christopher Ferris
e5aafbbb04 am f67287b1: am 3fe45103: am d9a06afb: Add a logging handler on timeout.
* commit 'f67287b1af547e5f177e91c0bca4c738d22211de':
  Add a logging handler on timeout.
2015-09-04 14:28:51 +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
b111a07962 am fdc6fbd0: am b2acb6b2: am b4998341: Merge "move init.trace.rc to frameworks/native"
* commit 'fdc6fbd0c7f98fa44b86e834a88441cce3bdedaa':
  move init.trace.rc to frameworks/native
2015-09-03 22:36:10 +00: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
Elliott Hughes
742372a489 am 27e427aa: am db31ac76: am 478da637: Merge "Improve adb sync_send error reporting."
* commit '27e427aaa2e56d68d914363df0c6b425837bab40':
  Improve adb sync_send error reporting.
2015-09-03 22:06:21 +00:00
Christopher Ferris
9c146c6050 am 9b7f9c4b: am 7f95fef6: am 825477ff: Merge "Add a logging handler on timeout."
* commit '9b7f9c4b005b174f24c3254cbaf7884d913d6ba6':
  Add a logging handler on timeout.
2015-09-03 22:06:19 +00:00