OSDN Git Service
Andres Morales [Wed, 16 Sep 2015 23:02:15 +0000 (23:02 +0000)]
am
2b71daef: Merge "Revert "[core][trusty] add gatekeeper module""
* commit '
2b71daefb2ffe58d35b696f1266f221811d3aad9':
Revert "[core][trusty] add gatekeeper module"
Andres Morales [Wed, 16 Sep 2015 22:54:14 +0000 (22:54 +0000)]
Merge "Revert "[core][trusty] add gatekeeper module""
Andres Morales [Wed, 16 Sep 2015 22:53:49 +0000 (22:53 +0000)]
Revert "[core][trusty] add gatekeeper module"
This reverts commit
6ee0f94adf3a15afe497995618a76b6ab1fa3f1b.
Change-Id: I673103c60f43b409cc72176c9450883336831cae
Andres Morales [Wed, 16 Sep 2015 22:50:36 +0000 (22:50 +0000)]
am
9dde5667: Merge "Revert "[core][trusty] add keymaster module""
* commit '
9dde56672b003d862f253711b023e3d3d675443b':
Revert "[core][trusty] add keymaster module"
Andres Morales [Wed, 16 Sep 2015 22:45:06 +0000 (22:45 +0000)]
Merge "Revert "[core][trusty] add keymaster module""
Andres Morales [Wed, 16 Sep 2015 22:44:34 +0000 (22:44 +0000)]
Revert "[core][trusty] add keymaster module"
This reverts commit
748b690415fc9bb674961f94c85647e46fcbfba8.
Change-Id: Ic65ce4af2d2f811129d941069dcd70e814c18f36
Andres Morales [Wed, 16 Sep 2015 22:03:18 +0000 (22:03 +0000)]
am
0e26977c: Merge changes from topic \'trusty-gk-km\'\'
* commit '
0e26977c56c53a4ffc65d1680bbad4478c23111c':
[core][trusty] add gatekeeper module
[core][trusty] add keymaster module
Michael Ryleev [Wed, 16 Sep 2015 22:03:16 +0000 (22:03 +0000)]
am
ebbbb7c6: Merge "Add libtrusty and corresponding test utility"
* commit '
ebbbb7c677a5c0c269be30ebaf9486513f2f8aff':
Add libtrusty and corresponding test utility
Andres Morales [Wed, 16 Sep 2015 21:58:36 +0000 (21:58 +0000)]
Merge changes from topic 'trusty-gk-km''
* changes:
[core][trusty] add gatekeeper module
[core][trusty] add keymaster module
Michael Ryleev [Wed, 16 Sep 2015 21:56:35 +0000 (21:56 +0000)]
Merge "Add libtrusty and corresponding test utility"
Andres Morales [Wed, 9 Sep 2015 00:56:35 +0000 (17:56 -0700)]
[core][trusty] add gatekeeper module
Change-Id: I1559a719034a754788d2cfa9a05fa60f36583bbf
Andres Morales [Wed, 9 Sep 2015 00:56:07 +0000 (17:56 -0700)]
[core][trusty] add keymaster module
Change-Id: I7495161a96c7a0652ff3d8318ebe6dab533fe319
Samuel Tan [Wed, 16 Sep 2015 18:30:29 +0000 (18:30 +0000)]
am
630e05b6: Merge "metricsd: move timer.h into include/metrics/"
* commit '
630e05b6af5f76bd7f063840e543186bde40ff0a':
metricsd: move timer.h into include/metrics/
Samuel Tan [Wed, 16 Sep 2015 18:24:15 +0000 (18:24 +0000)]
Merge "metricsd: move timer.h into include/metrics/"
Michael Ryleev [Thu, 23 Jul 2015 01:21:10 +0000 (18:21 -0700)]
Add libtrusty and corresponding test utility
libtrusty is an interface to Trusty TEE.
Change-Id: I7d53a744010f122257b686247997a8f11a4d480c
Yasuhiro Matsuda [Wed, 16 Sep 2015 02:49:31 +0000 (02:49 +0000)]
am
ada7fa06: Merge "Fix perfboot.py to work with the recent change."
* commit '
ada7fa063e4d8e2b8014a138bdf58d7729ce0ee9':
Fix perfboot.py to work with the recent change.
Yasuhiro Matsuda [Wed, 16 Sep 2015 02:41:58 +0000 (02:41 +0000)]
Merge "Fix perfboot.py to work with the recent change."
Yabin Cui [Tue, 15 Sep 2015 20:05:02 +0000 (20:05 +0000)]
am
fa965d96: Merge "adb: move adb to poll."
* commit '
fa965d9639dc264bb0d18e71dff998a4f648b50d':
adb: move adb to poll.
David Pursell [Tue, 15 Sep 2015 20:04:58 +0000 (20:04 +0000)]
am
d9076f21: Merge "adb: Kill subprocess when the client exits."
* commit '
d9076f2132006505227e5fec91926acb512c3d68':
adb: Kill subprocess when the client exits.
Samuel Tan [Tue, 15 Sep 2015 18:40:47 +0000 (11:40 -0700)]
metricsd: move timer.h into include/metrics/
Move timer.h into the include/metrics/ folder since some
source files in shill need to include this header file.
Adjust the timer.h include paths in the metricsd accordingly.
BUG: None
Change-Id: Id2f5e079d3a095f40d0f4d4e0d438bd22f1274ff
TEST: "mma" in metricsd folder succeeds.
Yabin Cui [Tue, 15 Sep 2015 18:40:51 +0000 (18:40 +0000)]
Merge "adb: move adb to poll."
David Pursell [Tue, 15 Sep 2015 18:27:33 +0000 (18:27 +0000)]
Merge "adb: Kill subprocess when the client exits."
David Pursell [Mon, 14 Sep 2015 22:36:26 +0000 (15:36 -0700)]
adb: Kill subprocess when the client exits.
When the client exits (e.g. with Ctrl+C) the subprocess should be
notified as well so it can cleanup if needed.
Bug: http://b/
23825725
Change-Id: Idb771710b293e0a9f7bebc9e2814b3a816e2c50e
Yabin Cui [Fri, 4 Sep 2015 23:19:56 +0000 (16:19 -0700)]
adb: move adb to poll.
It is reported that the registered fd can be bigger than FD_SETSIZE, and can't be
handled by select(). By moving to poll(), we can remove the limitation.
Although we can't ignore the possibility that there is a fd leak, but we can
still make the potential bug more explicit by moving to poll().
We didn't move to epoll() because it is not supported on mac.
Bug:
23820751
Change-Id: Icb39329c4984f1fef749472c9e088682ee8c3444
David Pursell [Tue, 15 Sep 2015 15:12:33 +0000 (15:12 +0000)]
am
0af19a0e: Merge "adb: Fix missing shell protocol usage."
* commit '
0af19a0e82d7808678f3b92a8c5b4b8cb80ee216':
adb: Fix missing shell protocol usage.
David Pursell [Tue, 15 Sep 2015 15:06:42 +0000 (15:06 +0000)]
Merge "adb: Fix missing shell protocol usage."
Yasuhiro Matsuda [Tue, 15 Sep 2015 05:00:10 +0000 (14:00 +0900)]
Fix perfboot.py to work with the recent change.
device.shell() was changed to return a (stdout, stderr) tuple in
the following CL.
https://android-review.googlesource.com/170420
This CL fixes perfboot.py to work with the return value.
Change-Id: I85d72fc63c1f96257fb19c3051482991a7b4049d
Steve Fung [Tue, 15 Sep 2015 04:52:58 +0000 (04:52 +0000)]
am
f5974755: Merge "crash_reporter: Add model_manifest_id field to report"
* commit '
f597475599232ace977dcbfca8b5860165b2c281':
crash_reporter: Add model_manifest_id field to report
Steve Fung [Tue, 15 Sep 2015 04:47:35 +0000 (04:47 +0000)]
Merge "crash_reporter: Add model_manifest_id field to report"
Steve Fung [Tue, 15 Sep 2015 01:13:35 +0000 (01:13 +0000)]
am
33046dcb: Merge "crash_reporter: Ensure crash_sender spread time is not negative"
* commit '
33046dcbfa39fcd0ae29b506a84ec90e5bdfad3d':
crash_reporter: Ensure crash_sender spread time is not negative
Steve Fung [Tue, 15 Sep 2015 01:06:09 +0000 (01:06 +0000)]
Merge "crash_reporter: Ensure crash_sender spread time is not negative"
Steve Fung [Mon, 14 Sep 2015 23:14:23 +0000 (16:14 -0700)]
crash_reporter: Add model_manifest_id field to report
Add the model_manifest_id from weave's configuration to the
crash report.
Bug:
22874192
Change-Id: I26d5334a6eb3b82fd07338e98ce0f3efbb2ff16d
Bertrand Simonnet [Mon, 14 Sep 2015 22:53:11 +0000 (22:53 +0000)]
am
3ef7f0af: Merge "metricsd: Add test case for the upload service."
* commit '
3ef7f0afb86be9473728f4fb3679be0c6f21ff82':
metricsd: Add test case for the upload service.
Bertrand Simonnet [Mon, 14 Sep 2015 22:53:10 +0000 (22:53 +0000)]
am
dd11d286: Merge "metricsd: Persist the report to disk if an upload fails."
* commit '
dd11d286caa881e135eaec64095d5e6bbc406b44':
metricsd: Persist the report to disk if an upload fails.
Bertrand Simonnet [Mon, 14 Sep 2015 22:53:08 +0000 (22:53 +0000)]
am
a9f1ed16: Merge "metricsd: Use the metrics directory everywhere."
* commit '
a9f1ed16a839ec4cc974e66734c11a01e8d71820':
metricsd: Use the metrics directory everywhere.
Bertrand Simonnet [Mon, 14 Sep 2015 22:48:39 +0000 (22:48 +0000)]
Merge "metricsd: Add test case for the upload service."
Bertrand Simonnet [Mon, 14 Sep 2015 22:48:32 +0000 (22:48 +0000)]
Merge "metricsd: Persist the report to disk if an upload fails."
Bertrand Simonnet [Mon, 14 Sep 2015 22:48:25 +0000 (22:48 +0000)]
Merge "metricsd: Use the metrics directory everywhere."
David Pursell [Mon, 14 Sep 2015 22:33:50 +0000 (15:33 -0700)]
adb: Fix missing shell protocol usage.
Some adb commands use the shell service but weren't using the
shell protocol, causing a protocol mismatch between the client and
the device. This CL uses the shell protocol whenever possible.
Change-Id: I4c9c75b7fd1d5bf3dc1f73900711840270527682
Steve Fung [Sat, 12 Sep 2015 10:21:59 +0000 (03:21 -0700)]
crash_reporter: Ensure crash_sender spread time is not negative
When calculating the crash_sender spread time, make sure that the
random number is not negative when converted to a shell int variable.
Bug:
24004011
Change-Id: I3b95dc244a26270ef2b93d5af4b0593a93eedcad
Steve Fung [Mon, 14 Sep 2015 22:13:58 +0000 (22:13 +0000)]
am
758db4db: Merge "crash_reporter: Read crash server from property"
* commit '
758db4dbe7ffc3176c25f615eb306bdeb2be2f50':
crash_reporter: Read crash server from property
Steve Fung [Mon, 14 Sep 2015 22:06:19 +0000 (22:06 +0000)]
Merge "crash_reporter: Read crash server from property"
Bertrand SIMONNET [Wed, 9 Sep 2015 20:27:33 +0000 (13:27 -0700)]
metricsd: Add test case for the upload service.
This test case ensures that we can log a metric with the metrics library
and upload it with the upload service.
BUG:
22879646
TEST: unit tests.
Change-Id: Idf4a1240d41745ebf7835089230608082eed19f5
Bertrand SIMONNET [Wed, 9 Sep 2015 17:39:51 +0000 (10:39 -0700)]
metricsd: Persist the report to disk if an upload fails.
If the metrics server is unreachable, we may need to resend a metrics
report later. Instead of keeping the staged report in memory, save it to
disk to avoid loosing data if the system restarts or crashes.
BUG:
23033262
TEST: unit tests.
Change-Id: Idd14964e40f022952469f47d675d8cda9586d7cd
Bertrand SIMONNET [Wed, 9 Sep 2015 17:38:20 +0000 (10:38 -0700)]
metricsd: Use the metrics directory everywhere.
Instead of passing different filenames around, only rely on the metrics
directory and infer the filepath from it. This makes testing easier.
BUG:
23939404
TEST: unit tests.
Change-Id: I79086acc3a546464114fa8ec4656ec04e1c43e35
Steve Fung [Sat, 12 Sep 2015 09:52:06 +0000 (02:52 -0700)]
crash_reporter: Read crash server from property
Read the crash server URL from the crash_reporter.server
property. If it is not set, return a configuration error.
Bug:
22874192
Change-Id: Iac341b6352fe9c1b54cd2e8561ed4a5bbe8ddddc
Steve Fung [Mon, 14 Sep 2015 20:24:48 +0000 (20:24 +0000)]
am
88880fd8: Merge "crash_reporter: Fix a couple crash_sender issues"
* commit '
88880fd8a906b2bcd5fe98e99ff475d812ad6d4f':
crash_reporter: Fix a couple crash_sender issues
Steve Fung [Mon, 14 Sep 2015 20:08:43 +0000 (20:08 +0000)]
Merge "crash_reporter: Fix a couple crash_sender issues"
Bertrand Simonnet [Mon, 14 Sep 2015 18:49:44 +0000 (18:49 +0000)]
am
eeedcc41: Merge "metricsd: Collect generic stats about the system."
* commit '
eeedcc4150d9e48fabfd3f142c8e4f05d09f82b0':
metricsd: Collect generic stats about the system.
David Pursell [Mon, 14 Sep 2015 18:45:34 +0000 (18:45 +0000)]
am
76f4a653: Merge changes from topic \'adb_shell\'
* commit '
76f4a6533c6b803e267225b42c5dda63f23bf3ea':
adb: add client side shell protocol and enable.
adb: implement shell protocol.
Bertrand Simonnet [Mon, 14 Sep 2015 18:44:24 +0000 (18:44 +0000)]
Merge "metricsd: Collect generic stats about the system."
David Pursell [Mon, 14 Sep 2015 18:39:37 +0000 (18:39 +0000)]
Merge changes from topic 'adb_shell'
* changes:
adb: add client side shell protocol and enable.
adb: implement shell protocol.
Elliott Hughes [Mon, 14 Sep 2015 17:59:12 +0000 (17:59 +0000)]
am
ad1c0bb5: Merge "Lose du to toybox."
* commit '
ad1c0bb5fd29d970514362388c00ced594b5acb4':
Lose du to toybox.
Elliott Hughes [Mon, 14 Sep 2015 17:50:09 +0000 (17:50 +0000)]
Merge "Lose du to toybox."
Elliott Hughes [Mon, 14 Sep 2015 17:37:05 +0000 (10:37 -0700)]
Lose du to toybox.
Change-Id: Ib240f74990274027258a454d3c63202791fcdb0b
David Zeuthen [Mon, 14 Sep 2015 15:39:49 +0000 (15:39 +0000)]
am
d906b297: Merge "fs_mgr: Error out if unable to determine slot_suffix"
* commit '
d906b2973b9f708b34d4df90a2496753f83199ec':
fs_mgr: Error out if unable to determine slot_suffix
David Zeuthen [Mon, 14 Sep 2015 15:33:35 +0000 (15:33 +0000)]
Merge "fs_mgr: Error out if unable to determine slot_suffix"
Steve Fung [Mon, 14 Sep 2015 09:56:07 +0000 (02:56 -0700)]
crash_reporter: Fix a couple crash_sender issues
- Added grep to the list of required modules.
- Run crash_sender with the 'system' group to allow calls to
metrics_client to read both metrics files owned by system and
crash_reporter files owned by root.
- Fix periodic_scheduler's check delay to actually be 5 minutes.
Bug:
23122375
Change-Id: Iff214c4e591a676a516162a92ea5aedcf0824f46
Daniel Erat [Sat, 12 Sep 2015 20:43:01 +0000 (20:43 +0000)]
am
3fa97b3c: Merge "Add libbinderwrapper."
* commit '
3fa97b3cc3787ad7a58a5348e147cef67d9439e6':
Add libbinderwrapper.
Daniel Erat [Sat, 12 Sep 2015 20:37:05 +0000 (20:37 +0000)]
Merge "Add libbinderwrapper."
Elliott Hughes [Sat, 12 Sep 2015 03:24:43 +0000 (03:24 +0000)]
am
c372a778: Merge "libbase_test: get it building for Windows"
* commit '
c372a778626dffdf6d1be5f98eafa966a95be082':
libbase_test: get it building for Windows
Elliott Hughes [Sat, 12 Sep 2015 03:16:51 +0000 (03:16 +0000)]
Merge "libbase_test: get it building for Windows"
Spencer Low [Sat, 12 Sep 2015 03:01:29 +0000 (20:01 -0700)]
libbase_test: get it building for Windows
Add to whitelist.
For some reason, when compiling, parseint_test.cpp would encounter
errors like the following:
host cross C++: host_cross_libbase_test <= system/core/base/parseint_test.cpp
In file included from external/gtest/include/gtest/gtest.h:1929:0,
from system/core/base/parseint_test.cpp:19:
system/core/base/parseint_test.cpp: In member function ‘virtual void parseint_signed_smoke_Test::TestBody()’:
external/gtest/include/gtest/internal/gtest-internal.h:133:55: error: converting ‘false’ to pointer type for argument 1 of ‘char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)’ [-Werror=conversion-null]
(sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1)
^
external/gtest/include/gtest/gtest_pred_impl.h:77:52: note: in definition of macro ‘GTEST_ASSERT_’
if (const ::testing::AssertionResult gtest_ar = (expression)) \
^
external/gtest/include/gtest/gtest_pred_impl.h:166:3: note: in expansion of macro ‘GTEST_PRED_FORMAT2_’
GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_)
^
external/gtest/include/gtest/gtest.h:1993:3: note: in expansion of macro ‘ASSERT_PRED_FORMAT2’
ASSERT_PRED_FORMAT2(::testing::internal:: \
^
external/gtest/include/gtest/gtest.h:1994:32: note: in expansion of macro ‘GTEST_IS_NULL_LITERAL_’
EqHelper<GTEST_IS_NULL_LITERAL_(expected)>::Compare, \
^
external/gtest/include/gtest/gtest.h:2011:32: note: in expansion of macro ‘GTEST_ASSERT_EQ’
# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2)
^
system/core/base/parseint_test.cpp:23:3: note: in expansion of macro ‘ASSERT_EQ’
ASSERT_EQ(false, android::base::ParseInt("x", &i));
^
For whatever reason, the gcc for Windows isn't handling the template
metaprogramming correctly, so to work-around the issue, I
search-and-replaced "ASSERT_EQ(false, " to "ASSERT_FALSE(" and
"ASSERT_EQ(true, " to "ASSERT_TRUE(" and that seems to compile just fine
for Linux and Windows (and the tests pass on both platforms).
Change-Id: I05132909d1f4b18afff23139652a218649689f2d
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
David Pursell [Sat, 12 Sep 2015 01:37:50 +0000 (01:37 +0000)]
am
7b749acd: Merge "adb: fix shell_service_protocol_test for Windows."
* commit '
7b749acd5f7de9448f851e84ac2d3d90d28e5f03':
adb: fix shell_service_protocol_test for Windows.
David Pursell [Sat, 12 Sep 2015 01:30:20 +0000 (01:30 +0000)]
Merge "adb: fix shell_service_protocol_test for Windows."
David Pursell [Fri, 11 Sep 2015 23:06:59 +0000 (16:06 -0700)]
adb: fix shell_service_protocol_test for Windows.
Adds missing #ifdef guards to shell_service_protocol_test.cpp so the
test compiles on Windows.
Also fixes a bug in Windows socketpair write implementation. Previously
it was only checking for a closed pipe if the write happened to block.
This adds an additional pre-check to exit immediately on a closed pipe.
These two changes allow the test to compile and pass on Windows.
Change-Id: Ib8853ed72f015fc0d623da47c32982cb3ffa4a3d
Elliott Hughes [Fri, 11 Sep 2015 23:23:52 +0000 (23:23 +0000)]
am
9336ee38: Merge "Fix (Windows) build."
* commit '
9336ee389f79296d04790d1a1dab6f55b6a4c221':
Fix (Windows) build.
Elliott Hughes [Fri, 11 Sep 2015 23:23:50 +0000 (23:23 +0000)]
am
0ad13cf2: Merge "fix adb_test Windows build"
* commit '
0ad13cf2982d428a4db742877720e5f4be738fa4':
fix adb_test Windows build
Elliott Hughes [Fri, 11 Sep 2015 23:18:48 +0000 (23:18 +0000)]
Merge "Fix (Windows) build."
Elliott Hughes [Fri, 11 Sep 2015 23:16:53 +0000 (16:16 -0700)]
Fix (Windows) build.
Change-Id: Ib9afd101d255d748ba6c15ed8075f3d10338c95c
Elliott Hughes [Fri, 11 Sep 2015 23:13:40 +0000 (23:13 +0000)]
Merge "fix adb_test Windows build"
Elliott Hughes [Fri, 11 Sep 2015 23:05:02 +0000 (23:05 +0000)]
am
ee46239c: Merge "adb: win32: make adb_getenv() case-insensitive"
* commit '
ee46239c358fac90813128fccbcb49292f8b04f3':
adb: win32: make adb_getenv() case-insensitive
Elliott Hughes [Fri, 11 Sep 2015 22:59:19 +0000 (22:59 +0000)]
Merge "adb: win32: make adb_getenv() case-insensitive"
Spencer Low [Wed, 9 Sep 2015 00:13:04 +0000 (17:13 -0700)]
adb: win32: make adb_getenv() case-insensitive
adb_getenv() should be case-insensitive just like the real getenv() on
Windows.
Added a unittest for adb_getenv(). In the process, made adb_test link
with -municode so that the environment block is Unicode.
Move wmain() from main.cpp to sysdeps_win32.cpp so that adb_test could
also use it.
Because wmain() moved, it wasn't as easy to do the runtime check to
verify that -municode was used, so do that check in _ensure_env_setup()
since adb_getenv() is called early in adb anyway.
Added a utility ToLower() which is good enough for env vars whose keys
are probably always ASCII to begin with.
Change-Id: I082f7fdee9dfe2c7f76b878528d2f7863df6d8d1
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
Spencer Low [Tue, 8 Sep 2015 06:39:02 +0000 (23:39 -0700)]
fix adb_test Windows build
adb/Android.mk: adb_test should build on Windows (and Darwin), so add to
the whitelist.
Change-Id: I778f6a7dff4caec92c48e0957591abf32f86ab1b
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
Dan Albert [Fri, 11 Sep 2015 22:14:35 +0000 (22:14 +0000)]
am
933f4fd4: Merge "Ensure that libbase and liblog can be built for Windows."
* commit '
933f4fd413f5a6c0e32c7963f1d0da580085df38':
Ensure that libbase and liblog can be built for Windows.
Elliott Hughes [Fri, 11 Sep 2015 22:14:33 +0000 (22:14 +0000)]
am
059544f6: Merge "Lose lsof to toybox."
* commit '
059544f6a8e809ec8c36a10c286be4bb012e2328':
Lose lsof to toybox.
David Pursell [Fri, 11 Sep 2015 22:14:17 +0000 (22:14 +0000)]
am
31139af0: Merge "adb: create shell protocol class (take 2)."
* commit '
31139af04f97c843db2a98c7fafc1d58d7f7c8ac':
adb: create shell protocol class (take 2).
Elliott Hughes [Fri, 11 Sep 2015 22:14:15 +0000 (22:14 +0000)]
am
b56bd000: Merge "Add ParseInt (and ParseUint)."
* commit '
b56bd000460254aacaaa897a07e90191b05e7160':
Add ParseInt (and ParseUint).
James Hawkins [Fri, 11 Sep 2015 22:14:03 +0000 (22:14 +0000)]
am
b02b6f41: Merge "metrics: Add an option to metrics_client to dump the logs cache."
* commit '
b02b6f410d5c92c7b016ed26895b5e21c16418a9':
metrics: Add an option to metrics_client to dump the logs cache.
Dan Albert [Fri, 11 Sep 2015 20:47:07 +0000 (20:47 +0000)]
Merge "Ensure that libbase and liblog can be built for Windows."
Elliott Hughes [Fri, 11 Sep 2015 20:44:48 +0000 (20:44 +0000)]
Merge "Lose lsof to toybox."
David Pursell [Wed, 9 Sep 2015 00:17:02 +0000 (17:17 -0700)]
adb: add client side shell protocol and enable.
Adds the shell protocol functionality to the client side and enables it
if the transport supports the feature.
Bug:http://b/
23031026
Change-Id: I9abe1c8b1d39f8dd09666321b1c761ad708a8854
Stephen Hines [Fri, 11 Sep 2015 05:47:07 +0000 (22:47 -0700)]
Ensure that libbase and liblog can be built for Windows.
Change-Id: If4adf1e2bd7ec36a7f02ae2e263d2db5187c6e7b
David Pursell [Mon, 31 Aug 2015 17:42:13 +0000 (10:42 -0700)]
adb: implement shell protocol.
Adds functionality for handling stdin/stdout/stderr streams and exit
codes using the shell protocol.
This CL just contains implementation for adbd which will not yet be
enabled. Once we have the ability to query transport features from the
adb client, another CL will add the implementation for the client side
and update the feature list to turn this on.
Note: this CL must be submitted together with a minadbd CL to update
the service_to_fd() function signature.
Bug: http://b/
23030641
Change-Id: Ibed55e9c1946d8a35190696163ff63e8fb880238
David Pursell [Fri, 11 Sep 2015 18:17:55 +0000 (18:17 +0000)]
Merge "adb: create shell protocol class (take 2)."
Elliott Hughes [Fri, 11 Sep 2015 18:00:20 +0000 (18:00 +0000)]
Merge "Add ParseInt (and ParseUint)."
Elliott Hughes [Fri, 11 Sep 2015 17:58:21 +0000 (10:58 -0700)]
Lose lsof to toybox.
Change-Id: I4b5e0c8c33f5b2dfd3db85628d9a657940978a10
David Zeuthen [Wed, 9 Sep 2015 22:15:11 +0000 (18:15 -0400)]
fs_mgr: Error out if unable to determine slot_suffix
Instead of falling back to suffix _a, we now error out if neither the
kernel commandline nor the misc partition specifies the suffix. It's
cleaner this way.
Change-Id: I3f58928a664433504ebdf8d0ee05a319be5097cf
James Hawkins [Fri, 11 Sep 2015 16:39:19 +0000 (16:39 +0000)]
Merge "metrics: Add an option to metrics_client to dump the logs cache."
Steve Fung [Fri, 11 Sep 2015 06:34:18 +0000 (06:34 +0000)]
am
a2e5b7cb: Merge "crash_reporter: Fix crash_sender"
* commit '
a2e5b7cb625169ec857fccd73003f912752b985c':
crash_reporter: Fix crash_sender
Steve Fung [Fri, 11 Sep 2015 06:29:28 +0000 (06:29 +0000)]
Merge "crash_reporter: Fix crash_sender"
Mark Salyzyn [Thu, 10 Sep 2015 16:30:36 +0000 (16:30 +0000)]
am
784a69f8: Merge "logd: worst uid record watermark part five"
* commit '
784a69f8650068980bcc692584b515ab2372ab5b':
logd: worst uid record watermark part five
Mark Salyzyn [Thu, 10 Sep 2015 16:24:25 +0000 (16:24 +0000)]
Merge "logd: worst uid record watermark part five"
Mark Salyzyn [Tue, 8 Sep 2015 16:12:51 +0000 (09:12 -0700)]
logd: worst uid record watermark part five
A regression that resulted in increased memory consumption for some
logging patterns because we rarely did merge or leading checks, and
age-out checking. On the last prune cycle, we reset for a full scan.
Add some comments describing the pruning processes.
Bug:
23327476
Bug:
23681639
Bug:
23685592
Change-Id: I22b0f339c9269b006831fda9cefe295a263ebb92
Steve Fung [Fri, 21 Aug 2015 00:07:50 +0000 (17:07 -0700)]
crash_reporter: Fix crash_sender
- Remove all the ChromeOS specific logic.
- Fix paths to correct Android paths.
- Add periodic_scheduler, and add crash_sender to init.
Bug:
23231196
Bug:
23233267
Change-Id: I12de28bfbe5d5b08831eda9b28c6d7a669c22290
David Zeuthen [Wed, 9 Sep 2015 22:52:32 +0000 (22:52 +0000)]
am
6ca11db7: Merge "fs_mgr: Fix ENOMEM behavior when dealing with slotselect."
* commit '
6ca11db7b7dc5e141c767b38328c3838a3b90b60':
fs_mgr: Fix ENOMEM behavior when dealing with slotselect.
David Zeuthen [Wed, 9 Sep 2015 22:45:24 +0000 (22:45 +0000)]
Merge "fs_mgr: Fix ENOMEM behavior when dealing with slotselect."
James Hawkins [Tue, 8 Sep 2015 22:18:17 +0000 (15:18 -0700)]
metrics: Add an option to metrics_client to dump the logs cache.
The format of the metrics dump is rudimentary just yet. Here is an example:
Metrics from /data/misc/metrics/uma-events
name: hello type: USER_ACTION
name: world type: USER_ACTION
This required the following changes:
* Added -d option to metrics_client
* Refactored file handling in SerializationUtils
- Factored out file opening and log parsing into helper methods
- Added ReadMetricsFromFile which is read-only so does not truncate the file
Change-Id: I6032d74242c79c678ec42a14e78fccc54e7af455
David Zeuthen [Wed, 9 Sep 2015 22:03:13 +0000 (18:03 -0400)]
fs_mgr: Fix ENOMEM behavior when dealing with slotselect.
Change-Id: I5460a8d31baa0d4817ff5fcbd9aac272071937f4