Commit Graph

17702 Commits

Author SHA1 Message Date
Dan Willemsen aaf4fcf482 Merge "Remove HOST_OS==windows check" 2015-09-09 18:13:22 +00:00
Yabin Cui 4a53f6ec43 am b73eb268: am 4ddb6a32: Merge "adb: remove unnecessary dependencies of liblog."
* commit 'b73eb268ffdf61257342bdb256f6dd372666ffaf':
  adb: remove unnecessary dependencies of liblog.
2015-09-09 18:03:27 +00:00
Yabin Cui 824a51eae4 am bd9305ee: am 0df24ea2: Merge "adb: refactor _is_valid_ack_reply_fd"
* commit 'bd9305eeb7152058ba8255f0c2601d512c906f98':
  adb: refactor _is_valid_ack_reply_fd
2015-09-09 18:03:25 +00:00
David Zeuthen 3724f4e34f am 1c7060e0: resolved conflicts for d8eed7ff to stage-aosp-master
* commit '1c7060e055b117321ddbeae533bdeb54cd5e808a':
  fs_mgr: Use slot_suffix field from bootloader_message.
2015-09-09 18:03:22 +00:00
Yabin Cui b73eb268ff am 4ddb6a32: Merge "adb: remove unnecessary dependencies of liblog."
* commit '4ddb6a3289d7cc1d1f60e3ae0af231da55f937ac':
  adb: remove unnecessary dependencies of liblog.
2015-09-09 17:57:36 +00:00
Yabin Cui bd9305eeb7 am 0df24ea2: Merge "adb: refactor _is_valid_ack_reply_fd"
* commit '0df24ea234fcfb9ac57ed94701868426a41d8642':
  adb: refactor _is_valid_ack_reply_fd
2015-09-09 17:57:34 +00:00
Yabin Cui 4ddb6a3289 Merge "adb: remove unnecessary dependencies of liblog." 2015-09-09 17:38:31 +00:00
Yabin Cui 0df24ea234 Merge "adb: refactor _is_valid_ack_reply_fd" 2015-09-09 17:38:20 +00:00
David Zeuthen 1c7060e055 resolved conflicts for d8eed7ff to stage-aosp-master
Change-Id: I7fb3ddc07d798f0f98075b9fab0bb88c88249455
2015-09-09 12:40:16 -04:00
David Zeuthen d8eed7ff66 Merge "fs_mgr: Use slot_suffix field from bootloader_message." 2015-09-09 16:11:50 +00:00
Badhri Jagan Sridharan a6c377b2f6 init: usb: Add configfs commands for USB gadget
Adds init support for:
accessory
audio_source
midi
adb
rndis

Bug=23633457

Change-Id: I12e68e25969adafcf3170769f91ae939d08b7dbc
2015-09-08 20:13:37 -07:00
Yabin Cui cb992d9a21 adb: remove unnecessary dependencies of liblog.
Change-Id: I1aaa9e6c1b47a70f8daf91745f6aec13c92b789f
2015-09-08 18:27:10 -07:00
Dan Albert d1175b39f2 am 639c454d: am feee6a00: Merge "Drop unused LOCAL_STATIC_LIBRARIES."
* commit '639c454d94fdb442495c9950d4c7f8a5503e0e5a':
  Drop unused LOCAL_STATIC_LIBRARIES.
2015-09-08 22:32:10 +00:00
Dan Albert 639c454d94 am feee6a00: Merge "Drop unused LOCAL_STATIC_LIBRARIES."
* commit 'feee6a000ddff08cf1beb8d962e503453dfdc63d':
  Drop unused LOCAL_STATIC_LIBRARIES.
2015-09-08 22:22:27 +00:00
Dan Albert feee6a000d Merge "Drop unused LOCAL_STATIC_LIBRARIES." 2015-09-08 22:13:45 +00:00
Bertrand SIMONNET ebbe35c2b5 metricsd: Collect generic stats about the system.
Collect memory usage and disk IO statistics periodically.
Also update the Android.mk file to use clang by default.

BUG: 22953719
TEST: builds on external and internal branches.

Change-Id: I1ee3683d014586cf7f711d2e090a99429752063c
2015-09-08 13:40:48 -07:00
David Zeuthen 227ef3c5d2 fs_mgr: Use slot_suffix field from bootloader_message.
This will make fs_mgr look in the misc partition for the A/B suffix to
use if one of more fstab entries is using the slotselect option and the
bootloader doesn't specify the suffix.

Change-Id: I24233195f60dd352bf8e7ac32b0d95dcd3323156
2015-09-08 15:54:32 -04:00
Dan Albert d83a26033c Drop unused LOCAL_STATIC_LIBRARIES.
This is ignored for BUILD_STATIC_LIBRARY.

Change-Id: Ib5553e0aeaa30cdb2b29f18a4d5d0b0bf1b8740a
2015-09-08 10:55:05 -07:00
David Pursell b9e2e84e7e adb: create shell protocol class (take 2).
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.

This is the second attempt at this CL, the first is at
http://r.android.com/169600. The problems was using sighandler_t
which is not available on mac. sig_t is used instead which is available
due to _GNU_SOURCE being defined in Android.mk, which causes
_BSD_SOURCE -> __USE_BSD -> sig_t to be defined. Nothing else has been
changed from the original CL.

Bug: http://b/23030641
Change-Id: I7bd7f5a82ad811fbca7a3eee1236d2c55ae57c48
2015-09-08 10:04:10 -07:00
Narayan Kamath 51e740f802 resolved conflicts for 32d86587 to mnc-dr-dev-plus-aosp
Change-Id: I381133e7dd93f908bd3d2b42e8af83d954e428af
2015-09-08 13:59:49 +01:00
Narayan Kamath 32d86587f3 am cdf094f6: am c609c31f: libutils: Fix integer overflows in VectorImpl.
* commit 'cdf094f667a251ddb03f95a4aa099e3acdaf9c4d':
  libutils: Fix integer overflows in VectorImpl.
2015-09-08 12:52:22 +00:00
Narayan Kamath cdf094f667 am c609c31f: libutils: Fix integer overflows in VectorImpl.
* commit 'c609c31fb56ae434caa2d0153cd0a2f74a715071':
  libutils: Fix integer overflows in VectorImpl.
2015-09-08 12:40:52 +00:00
Spencer Low a13df3070f adb: refactor _is_valid_ack_reply_fd
Visual Studio's 'jump to reference' feature couldn't parse
adb_commandline() because I used an #ifdef in the middle of an if
statement, so this refactors the code into a separate helper function. I
just copied the code and inverted the comparisons.

No need for sysdeps since this is pretty minor.

Change-Id: Ifd5c62b0b505080ada6db5cc19739c6f07b94de9
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-07 16:20:13 -07: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
Elliott Hughes afe151fb02 Add ParseInt (and ParseUint).
strtol and family are hard to use correctly, and most callers don't
even try.

Change-Id: I2833622a92cccd4662c0c5bdbbef5eeb4e496914
2015-09-04 16:32:00 -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
Dan Willemsen 66680c506a Remove HOST_OS==windows check
With the HOST_CROSS_OS build system change, LOCAL_MULTILIB := first now
behaves the same way.

Change-Id: I03294403e5a106a53d4a0d48b176434221284901
2015-09-04 14:05:19 -07: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 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