Commit graph

18557 commits

Author SHA1 Message Date
Bertrand Simonnet
a3e097c9ca Merge "metricsd: Remove dead code."
am: 695da48944

* commit '695da489440335ef41649eece4dc4ca5eca3b28a':
  metricsd: Remove dead code.
2015-11-16 21:22:24 +00:00
Bertrand Simonnet
695da48944 Merge "metricsd: Remove dead code." 2015-11-16 21:17:58 +00:00
Mark Salyzyn
52b9f02076 Merge "Revert "liblog: resolve deadlocks""
am: e6cf1c6372

* commit 'e6cf1c63726bee6b7ca69d68775f79e16f756ba6':
  Revert "liblog: resolve deadlocks"
2015-11-16 19:11:39 +00:00
Mark Salyzyn
e6cf1c6372 Merge "Revert "liblog: resolve deadlocks"" 2015-11-16 19:07:47 +00:00
Mark Salyzyn
c2e7d4965f Revert "liblog: resolve deadlocks"
This reverts commit 7a2a307192.

Bug: 25693940
Change-Id: I9a7c926289e972f80c03c92e33535e1dedaa7381
2015-11-16 19:00:41 +00:00
Calin Juravle
2a095e186b Merge "Don\'t create profiles directory under dalvik-cache."
am: 942f8ea84f

* commit '942f8ea84f3f96c2e2556fe90ebba0ec76730553':
  Don't create profiles directory under dalvik-cache.
2015-11-16 11:21:48 +00:00
Calin Juravle
942f8ea84f Merge "Don't create profiles directory under dalvik-cache." 2015-11-16 11:08:46 +00:00
Gilad Arnold
8468b26e73 Merge "Fix permissions for /data/nativetest{,64}/tests.txt."
am: e32cb1b14c

* commit 'e32cb1b14cb2cfc434ade4b4ec80fc51b49c6762':
  Fix permissions for /data/nativetest{,64}/tests.txt.
2015-11-15 06:23:20 +00:00
Gilad Arnold
e32cb1b14c Merge "Fix permissions for /data/nativetest{,64}/tests.txt." 2015-11-15 06:20:09 +00:00
Gilad Arnold
1bc7888104 Fix permissions for /data/nativetest{,64}/tests.txt.
This is not an executable so we have to specifically set its permissions
accordingly.

Bug: 25668833
Change-Id: I502f69bad75b4da4fdc29eb3ebaa42a19ae04d27
2015-11-14 18:25:31 -08:00
David Pursell
0146f2feb6 Merge "Revert "fastboot: create Transport object.""
am: 44c58471e4

* commit '44c58471e4c0bf8de8c98980d268e9f5f827e253':
  Revert "fastboot: create Transport object."
2015-11-14 00:30:39 +00:00
David Pursell
44c58471e4 Merge "Revert "fastboot: create Transport object."" 2015-11-14 00:18:43 +00:00
David Pursell
c0504e1873 Revert "fastboot: create Transport object."
This broke some stuff, will look into it Monday.

This reverts commit 6f233a7799.

Change-Id: I155bc85d21fda3b0ba1e5e17839059797fb15509
2015-11-14 00:15:57 +00:00
Josh Gao
e01de06892 Merge "adb: don\'t pull symlinks."
am: 29843cf141

* commit '29843cf1412e849978daa0aae4bd56e43f141751':
  adb: don't pull symlinks.
2015-11-13 23:27:41 +00:00
Josh Gao
29843cf141 Merge "adb: don't pull symlinks." 2015-11-13 23:22:47 +00:00
Josh Gao
f96dc73b9f adb: don't pull symlinks.
Pulling symlinks was broken for directories, and it doesn't seem like
there's a good way to make it not broken, given that the protocol doesn't
have readlink (and we don't want to create symlinks on Windows, anyway).
The behavior for files doesn't seem to be especially useful, either.

Bug: http://b/25601283
Change-Id: Ie1d27e93dd09cbc0c178623b390041d1cb11f726
2015-11-13 15:17:02 -08:00
Bertrand SIMONNET
ad6ab580b2 metricsd: Remove dead code.
We don't report the cpu frequency, we can remove that part of the code.

Bug: 25693224
Test: unit tests.

Change-Id: I510654a74261dbd66b7183ea54eef1e1eadc4d91
2015-11-13 15:12:49 -08:00
David Pursell
0aab246b8e Merge "fastboot: create Transport object."
am: f131772a79

* commit 'f131772a79f75656d9e7593268e5bdecf40ebec0':
  fastboot: create Transport object.
2015-11-13 22:53:22 +00:00
David Pursell
f131772a79 Merge "fastboot: create Transport object." 2015-11-13 22:49:08 +00:00
Daniel Rosenberg
ec7fa7b479 Merge "Fix fastboot to not add \'-\' before suffix"
am: ce24abe261

* commit 'ce24abe261cbc9696c7ef61818153b99943d026e':
  Fix fastboot to not add '-' before suffix
2015-11-13 21:29:27 +00:00
Daniel Rosenberg
ce24abe261 Merge "Fix fastboot to not add '-' before suffix" 2015-11-13 21:24:39 +00:00
Daniel Rosenberg
996ecd8b7d Fix fastboot to not add '-' before suffix
Change-Id: I9351b385412151498f47ab46a2620f21b9ac38b8
2015-11-13 12:56:19 -08:00
Elliott Hughes
da2319bf4d Merge "Improve adb help text and adb backup error reporting."
am: 82a2b2441c

* commit '82a2b2441ca7684bb22d8b7f72546b4754e817a3':
  Improve adb help text and adb backup error reporting.
2015-11-13 20:30:46 +00:00
Elliott Hughes
82a2b2441c Merge "Improve adb help text and adb backup error reporting." 2015-11-13 20:25:11 +00:00
Elliott Hughes
2944e58524 Merge "Improve top(1) compatibility and interactive usefulness."
am: 4386b890a7

* commit '4386b890a7b357572305a282772f30a162b5a4af':
  Improve top(1) compatibility and interactive usefulness.
2015-11-13 19:31:01 +00:00
Elliott Hughes
4386b890a7 Merge "Improve top(1) compatibility and interactive usefulness." 2015-11-13 19:28:57 +00:00
Mark Salyzyn
c7017ffbc8 Merge "logd: klogd: parse error"
am: c6f3b96bd8

* commit 'c6f3b96bd8b9b0ca366009db6b6e497761adb642':
  logd: klogd: parse error
2015-11-13 19:28:06 +00:00
Mark Salyzyn
c6f3b96bd8 Merge "logd: klogd: parse error" 2015-11-13 19:22:10 +00:00
David Pursell
6f233a7799 fastboot: create Transport object.
This CL creates a Transport object to provide a generic interface for
various transports. Specifically this is designed to be able to add UDP
support to fastboot in an upcoming CL without changing the main program
logic.

Also includes some minor code style fixes and replaces malloc/free
in the USB implementation files with smart pointers and std::string.

Bug: http://b/22029765
Change-Id: I68641af0da7d13db4647f5e20a18d04d67f0b327
2015-11-13 11:08:17 -08:00
Elliott Hughes
56e6813e27 Improve adb help text and adb backup error reporting.
Bug: https://code.google.com/p/android/issues/detail?id=188220
Bug: http://b/25677893
Change-Id: If174049e86d65d95db93a6e071c089dcd1d7cd4f
2015-11-13 11:04:10 -08:00
Ruchi Kandoi
741df1263e Merge "healthd: Support new PD and USB Type C types"
am: ab75edb4ad

* commit 'ab75edb4ad01b518cb5c96a5a3d4ad344bc4ce26':
  healthd: Support new PD and USB Type C types
2015-11-13 17:39:54 +00:00
Ruchi Kandoi
ab75edb4ad Merge "healthd: Support new PD and USB Type C types" 2015-11-13 17:36:07 +00:00
Elliott Hughes
01f5c3afc8 Merge "adb: win32: Unicode USB device names"
am: 76aefd5f9b

* commit '76aefd5f9b46b9abe0a24bcac105a081b2a9a23a':
  adb: win32: Unicode USB device names
2015-11-13 16:46:15 +00:00
Elliott Hughes
76aefd5f9b Merge "adb: win32: Unicode USB device names" 2015-11-13 16:41:31 +00:00
Elliott Hughes
d7bd5759d2 Improve top(1) compatibility and interactive usefulness.
The toolbox -t option is really the standard -H option. Add -H so
I can switch dumpstate over.

We should also flush after each run so we don't arbitrarily truncate
at the stdio buffer size. (I'm pretty sure no one uses toolbox top
interactively, but it annoyed me while testing -H.)

Change-Id: Ib87cb541d1b21c48468614b2ef60b0cc62694c95
2015-11-13 08:30:12 -08:00
Mark Salyzyn
eb29808615 logd: klogd: parse error
Resolve three areas missing taglen checking. Add some additional
limit-checking paranoia. Problem started when p was allowed to
go beyond the size of the incoming buffer in some blind
p = cp + 1 fragments, placed the check for that after them all
before harm could be done, rather than in each location.

Bug: 25620123
Change-Id: Ib5687fd30ef0cd3ba3bc0df310b436ad675ccabc
2015-11-13 07:58:05 -08:00
Mark Salyzyn
650a06e01b Merge "liblog: resolve deadlocks"
am: 5559f1d6e8

* commit '5559f1d6e89d1a4a5140328deb9b420f7d540508':
  liblog: resolve deadlocks
2015-11-13 15:22:57 +00:00
Mark Salyzyn
5559f1d6e8 Merge "liblog: resolve deadlocks" 2015-11-13 15:16:49 +00:00
Spencer Low
bb2900098a adb: win32: Unicode USB device names
Cleanup TODO and instead of (poorly) converting the device name from
wchar_t to char, just retrieve and store it as wchar_t, simplifying the
code.

This probably isn't necessary since device names are probably always
ASCII, but this cleans things up.

Change-Id: Ib780dcdc1e0e06b97b61e25d29a23874b35d7800
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-12 20:13:21 -08:00
Elliott Hughes
187858496b Merge "adb: win32: remove widen()/narrow() in favor of UTF8ToWide()/WideToUTF8()"
am: 61a560aeb1

* commit '61a560aeb10dc5833fe6d1118a773e85113a75bc':
  adb: win32: remove widen()/narrow() in favor of UTF8ToWide()/WideToUTF8()
2015-11-13 03:08:30 +00:00
Elliott Hughes
61a560aeb1 Merge "adb: win32: remove widen()/narrow() in favor of UTF8ToWide()/WideToUTF8()" 2015-11-13 03:05:02 +00:00
Benson Leung
8a4eef60e1 healthd: Support new PD and USB Type C types
See the new types added here :
https://chromium-review.googlesource.com/304660
Add support for these.

Signed-off-by: Benson Leung <bleung@google.com>

Change-Id: I12c51e0611692a763a7f1cda57c77ad83d7aa7ea
2015-11-12 18:12:43 -08:00
Spencer Low
d21dc825bb adb: win32: remove widen()/narrow() in favor of UTF8ToWide()/WideToUTF8()
Now that we have a more standardized API (also available in Chromium),
switch to it. Another benefit is real error handling instead of just
killing the process on invalid Unicode.

Make UTF8ToWide()/WideToUTF8() set errno to EILSEQ on bad input. This is
the same error code that wcsrtombs(3) uses.

Update the unittest to check for EILSEQ.

Change-Id: Ie92acf74d37adaea116cf610c1bf8cd433741e16
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-12 17:13:08 -08:00
Gilad Arnold
c6ec2aba01 Merge "Sane ownership/permissions for directories in /data/nativetest{,64}."
am: 5d75c9d9c2

* commit '5d75c9d9c20181defe778e018a50c37ab784cffc':
  Sane ownership/permissions for directories in /data/nativetest{,64}.
2015-11-13 01:01:43 +00:00
Gilad Arnold
5d75c9d9c2 Merge "Sane ownership/permissions for directories in /data/nativetest{,64}." 2015-11-13 00:56:59 +00:00
Mark Salyzyn
7a2a307192 liblog: resolve deadlocks
Although ever present, an increased regression introduced with
commit b6bee33182 (liblog: logd:
support logd.timestamp = monotonic).

A signal handler can interrupt in locked context, if log is written
in the signal handler, we are in deadlock. Block signals while we
are locked. Separate out timestamp lock from is loggable lock to
reduce contention situations. Provide a best-guess response if
lock would fail in timestamp path.

Bug: 25563384
Change-Id: I6dccd6b99ebace1c473c03a785a35c63ed5c6a8a
2015-11-12 15:39:04 -08:00
Daniel Rosenberg
79915d9ea7 Merge changes I8fb6b513,I6dd16245,I0c2753e2
am: 8336a96c9c

* commit '8336a96c9c4052dbbd7684eaa22b62bf0a4d0732':
  Update fastboot help command with long options
  Changed set_active to be a flag
  Fix fastboot variable name
2015-11-12 23:27:09 +00:00
Daniel Rosenberg
8336a96c9c Merge changes I8fb6b513,I6dd16245,I0c2753e2
* changes:
  Update fastboot help command with long options
  Changed set_active to be a flag
  Fix fastboot variable name
2015-11-12 23:22:00 +00:00
Bertrand Simonnet
2a95850444 Merge "metricsd: Fix the update channel parsing logic."
am: 87d2486777

* commit '87d2486777975b70a74d24385838c8e55ea86a18':
  metricsd: Fix the update channel parsing logic.
2015-11-12 23:02:58 +00:00
Bertrand Simonnet
87d2486777 Merge "metricsd: Fix the update channel parsing logic." 2015-11-12 22:55:24 +00:00