Commit graph

16519 commits

Author SHA1 Message Date
Tim Kilbourn
bb41f7d6ed am 94653364: Merge "Use init to write usb typec props" into mnc-dr-dev
* commit '946533648c49f2700b6e0f73383699597649ee60':
  Use init to write usb typec props
2015-08-19 01:41:40 +00:00
Elliott Hughes
68f66cf7e7 am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."
* commit '8c86e4e2c075c7a879a9f73b56ab075dde61176a':
  Remove a HAVE_MS_C_RUNTIME I missed.
2015-08-19 01:39:24 +00:00
Elliott Hughes
8c86e4e2c0 am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."
* commit 'd0cae5b9fead406c38df5dd55bd7d41fe22a6719':
  Remove a HAVE_MS_C_RUNTIME I missed.
2015-08-19 01:31:51 +00:00
Elliott Hughes
d0cae5b9fe Merge "Remove a HAVE_MS_C_RUNTIME I missed." 2015-08-19 01:26:26 +00:00
Elliott Hughes
27507d8ba1 Remove a HAVE_MS_C_RUNTIME I missed.
Change-Id: I063c6c802b8967d812d4f4a0972f00b0a88704af
2015-08-18 18:03:04 -07:00
Tim Kilbourn
946533648c Merge "Use init to write usb typec props" into mnc-dr-dev 2015-08-18 19:54:35 +00:00
Sergio Giro
bc16133274 am 2bfde572: am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
* commit '2bfde57237209675e2375ea66185a3e050ca246f':
  libutils: fix overflow in String8::allocFromUTF8
2015-08-18 17:38:33 +00:00
Sergio Giro
c4abbcbdde am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8"
* commit 'f468d1e14c0bb777d557a6a86dead260e40ff8aa':
  libutils: fix overflow in String8::allocFromUTF8
2015-08-18 17:25:33 +00:00
Sergio Giro
f468d1e14c am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8"
* commit '1d44be87ffdc5e3bc074ab68200bff9d32c60d3a':
  libutils: fix overflow in String8::allocFromUTF8
2015-08-18 17:21:11 +00:00
Sergio Giro
2bfde57237 am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
* commit '29c1275519ef85fa3f30be351f19dc6e7eedbee9':
  libutils: fix overflow in String8::allocFromUTF8
2015-08-18 17:20:00 +00:00
Sergio Giro
29c1275519 Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev 2015-08-18 17:15:11 +00:00
Sergio Giro
ebabef2752 libutils: fix overflow in String8::allocFromUTF8
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908

Bug: 23290056

(cherry picked from commit 4eeacbeec0)

Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-18 18:06:38 +01:00
Sergio Giro
1d44be87ff Merge "libutils: fix overflow in String8::allocFromUTF8" 2015-08-18 17:04:07 +00:00
Sergio Giro
4eeacbeec0 libutils: fix overflow in String8::allocFromUTF8
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908

Bug: 23290056
Change-Id: Ide0e9a8acc4e95a9104bab3ae803aa3a40098222
2015-08-18 14:44:54 +01:00
Yusuke Sato
c52f66b548 am 885400fd: am 4d09db9d: Merge "perfboot.py: Add --end-tag option"
* commit '885400fdbabf9850bd680725c591cc00f2aa71fe':
  perfboot.py: Add --end-tag option
2015-08-18 05:55:34 +00:00
Yusuke Sato
885400fdba am 4d09db9d: Merge "perfboot.py: Add --end-tag option"
* commit '4d09db9d1a4139933cdb0ac9b5bcdebf8cc528eb':
  perfboot.py: Add --end-tag option
2015-08-18 05:51:12 +00:00
Yusuke Sato
4d09db9d1a Merge "perfboot.py: Add --end-tag option" 2015-08-18 05:44:04 +00:00
Yusuke Sato
3966ebb74d perfboot.py: Add --end-tag option
The current behavior, which is to use tags[-1] for end_tag, is good
enough in most cases, but sometime it makes more sense to use a
different one as end_tag.

For example, when optimizing APK scanning code in package manager,
using 'boot_progress_pms_scan_end' as end_tag would give us quicker
benchmark iterations as well as more relevant numbers possibly with
a smaller standard deviation.

Change-Id: Ic6371c936b36d1d87e9742502fd8958682a3b7d5
2015-08-17 22:07:34 -07:00
Nick Kralevich
a0683307e7 am 77b9868a: am 6d814037: Merge "libutils: fix signed/unsigned comparison warnings"
* commit '77b9868af9313ab5b7f62d7fea709dbfb519dd2c':
  libutils: fix signed/unsigned comparison warnings
2015-08-18 04:15:23 +00:00
Nick Kralevich
77b9868af9 am 6d814037: Merge "libutils: fix signed/unsigned comparison warnings"
* commit '6d81403797b7c84e6b17f826219068e96247f653':
  libutils: fix signed/unsigned comparison warnings
2015-08-18 04:03:35 +00:00
Nick Kralevich
6d81403797 Merge "libutils: fix signed/unsigned comparison warnings" 2015-08-18 04:00:00 +00:00
Nick Kralevich
3e6c451908 libutils: fix signed/unsigned comparison warnings
Change-Id: Ib283c85a404a20688c5357fa513e5d07c2f42803
2015-08-17 20:54:15 -07:00
Tim Kilbourn
8c12fdf4ab Use init to write usb typec props
The sysfs nodes are owned by root, so use init to write role changes.

Bug: 21615151
Change-Id: I39ad03a23af0be9ac859d4fb79a46edc27e30f4e
2015-08-17 14:56:57 -07:00
Elliott Hughes
f2437506e1 am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core."
* commit '8025096e2e523d6d03a35b19471793f85e03ec1a':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core.
2015-08-17 21:05:58 +00:00
Elliott Hughes
8025096e2e am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core."
* commit '28595721b19791cf4c857f048acdaeae632d329e':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core.
2015-08-17 20:57:49 +00:00
Elliott Hughes
28595721b1 Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core." 2015-08-17 20:50:50 +00:00
Elliott Hughes
cd4ef7581d Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core.
Change-Id: I202c3185d177c85d02ee5d9f7e5bf3422c1422db
2015-08-17 12:38:58 -07:00
Evgenii Stepanov
548f53d066 am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
* commit '1ec3ba4471d5883742b2500ba53ed2272539e756':
  Read global ASAN_OPTIONS from a file.
2015-08-17 01:15:06 +00:00
Nick Kralevich
d7f0a73f8d am 64c30a79: am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer"
* commit '64c30a79def4dc29749a86c00a970243a2a45f1e':
  init: add LOCAL_SANITIZE := integer
2015-08-17 01:15:05 +00:00
Evgenii Stepanov
1ec3ba4471 am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
* commit '428f626d1ba9819156549c4ce5b044aadbda014b':
  Read global ASAN_OPTIONS from a file.
2015-08-17 01:10:57 +00:00
Nick Kralevich
64c30a79de am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer"
* commit '084c00b80432a9b290c7b7c1b43c880de13553de':
  init: add LOCAL_SANITIZE := integer
2015-08-17 01:10:56 +00:00
Evgenii Stepanov
428f626d1b Merge "Read global ASAN_OPTIONS from a file." 2015-08-16 18:42:38 +00:00
Nick Kralevich
084c00b804 Merge "init: add LOCAL_SANITIZE := integer" 2015-08-16 15:37:35 +00:00
Nick Kralevich
f90b653667 init: add LOCAL_SANITIZE := integer
Call abort() on undefined or sketchy integer behavior.
Protects against integer overflow attacks.

Change-Id: If73e6b382f2ee645fec406805739f9684ddbb5f0
2015-08-15 15:24:23 +00:00
Elliott Hughes
065cc3087b am 5abbd967: am 94a845d9: Merge "Lose ionice and renice to toybox."
* commit '5abbd9671758075f85385985aeaa1ae2636f316b':
  Lose ionice and renice to toybox.
2015-08-14 23:47:40 +00:00
Elliott Hughes
5abbd96717 am 94a845d9: Merge "Lose ionice and renice to toybox."
* commit '94a845d97084ed2427462c4255c8709f50b6200f':
  Lose ionice and renice to toybox.
2015-08-14 23:36:32 +00:00
Elliott Hughes
94a845d970 Merge "Lose ionice and renice to toybox." 2015-08-14 23:29:09 +00:00
Elliott Hughes
17ddfcb282 Lose ionice and renice to toybox.
Change-Id: I77264e70aeff5a2320ce178c8e7176b67b898bd9
2015-08-14 15:35:33 -07:00
David Pursell
9fee3dd47d am 6a701bd9: am b53b521e: Merge "Add adb features."
* commit '6a701bd94b067c2ab873964f63c3d954bc59610f':
  Add `adb features`.
2015-08-14 16:13:16 +00:00
David Pursell
bc53ff9102 am be1f5732: am f4bda753: Merge "Add feature list to connection banner."
* commit 'be1f57325f6fe1702b0d18fcdb21efe4731a191d':
  Add feature list to connection banner.
2015-08-14 16:13:14 +00:00
David Pursell
6a701bd94b am b53b521e: Merge "Add adb features."
* commit 'b53b521e3753e0a2f3400dcd2c8cbf73912b0f5a':
  Add `adb features`.
2015-08-14 16:07:55 +00:00
David Pursell
be1f57325f am f4bda753: Merge "Add feature list to connection banner."
* commit 'f4bda7538955adef6d66b8f9871c83db67a7cde4':
  Add feature list to connection banner.
2015-08-14 16:07:53 +00:00
David Pursell
b53b521e37 Merge "Add adb features." 2015-08-14 16:03:43 +00:00
David Pursell
f4bda75389 Merge "Add feature list to connection banner." 2015-08-14 16:01:50 +00:00
Dan Albert
90d4b739ab Add adb features.
Shows the features supported by the active adb server.

Change-Id: I4a58a2ca082823c43f7a49e2c62ff80df6426756
2015-08-14 08:25:23 -07:00
Dan Albert
1792c23cb8 Add feature list to connection banner.
This allows us to test for features explicitly rather than relying on
the protocol version number, allowing us to fall back gracefully if a
feature is not supported.

This will be needed for the upcoming shell upgrades for stdout/stderr
separation and exit code reporting.

Change-Id: Ibb1d8ad2611f7209901ee76d51346b453e9c5873
2015-08-14 08:24:37 -07:00
Elliott Hughes
5309200904 am 2416b832: am 15c6de75: Merge "Start iterating USB pipe endpoints from 1."
* commit '2416b8320cdce59ae267d60d89b0ef96de6a9d95':
  Start iterating USB pipe endpoints from 1.
2015-08-14 03:22:38 +00:00
Elliott Hughes
68054cab55 am b4aa1777: am 782daf89: Merge "Fix the Mac libbase build."
* commit 'b4aa177701a2ddcd3390eccc95c0e06cd9b587ef':
  Fix the Mac libbase build.
2015-08-14 03:22:36 +00:00
Elliott Hughes
2416b8320c am 15c6de75: Merge "Start iterating USB pipe endpoints from 1."
* commit '15c6de753020bfa029e4add5aa8bf86b44efcc2b':
  Start iterating USB pipe endpoints from 1.
2015-08-14 03:18:47 +00:00
Elliott Hughes
b4aa177701 am 782daf89: Merge "Fix the Mac libbase build."
* commit '782daf892d5f68e51200a4da48e9ab1bc1dedd23':
  Fix the Mac libbase build.
2015-08-14 03:18:45 +00:00