Commit Graph

16988 Commits

Author SHA1 Message Date
Yabin Cui eee68196e9 am 0b743df4: Merge "Add unit tests for local socket."
* commit '0b743df4c4813d59c0405fbb32d59441399d8478':
  Add unit tests for local socket.
2015-09-17 02:38:45 +00:00
Yabin Cui 0b743df4c4 Merge "Add unit tests for local socket." 2015-09-17 02:32:12 +00:00
Elliott Hughes b9b0519995 am d17cf08e: Merge "adb: win32: fix regression on older versions of Windows"
* commit 'd17cf08eca500a96f4808744b8a0a34664291de8':
  adb: win32: fix regression on older versions of Windows
2015-09-17 00:08:43 +00:00
Elliott Hughes d17cf08eca Merge "adb: win32: fix regression on older versions of Windows" 2015-09-17 00:03:22 +00:00
Spencer Low bc36bdbdc8 adb: win32: fix regression on older versions of Windows
On Windows 7, GetStdHandle() may return console pseudo-handles. If you
call SetHandleInformation(h, HANDLE_FLAG_INHERIT, 0) on such a handle,
it will fail. These failures should be ignored like the old code.

Newer versions of Windows return real handles that don't have this
issue. Console pseudo-handles can apparently be identified by the values
3, 7, 11.

This is a regression from 2122c7a148.

https://code.google.com/p/android/issues/detail?id=186599

Change-Id: I287a74a81d37e0ebe62d673a3f5651ee5439c0d2
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-16 16:40:06 -07:00
Andres Morales 19c244c511 am 2b71daef: Merge "Revert "[core][trusty] add gatekeeper module""
* commit '2b71daefb2ffe58d35b696f1266f221811d3aad9':
  Revert "[core][trusty] add gatekeeper module"
2015-09-16 23:02:15 +00:00
Andres Morales 2b71daefb2 Merge "Revert "[core][trusty] add gatekeeper module"" 2015-09-16 22:54:14 +00:00
Andres Morales 1a1474caf2 Revert "[core][trusty] add gatekeeper module"
This reverts commit 6ee0f94adf.

Change-Id: I673103c60f43b409cc72176c9450883336831cae
2015-09-16 22:53:49 +00:00
Andres Morales f07480681d am 9dde5667: Merge "Revert "[core][trusty] add keymaster module""
* commit '9dde56672b003d862f253711b023e3d3d675443b':
  Revert "[core][trusty] add keymaster module"
2015-09-16 22:50:36 +00:00
Andres Morales 9dde56672b Merge "Revert "[core][trusty] add keymaster module"" 2015-09-16 22:45:06 +00:00
Andres Morales 8ea9657ccd Revert "[core][trusty] add keymaster module"
This reverts commit 748b690415.

Change-Id: Ic65ce4af2d2f811129d941069dcd70e814c18f36
2015-09-16 22:44:34 +00:00
Andres Morales ee47386aa3 am 0e26977c: Merge changes from topic \'trusty-gk-km\'\'
* commit '0e26977c56c53a4ffc65d1680bbad4478c23111c':
  [core][trusty] add gatekeeper module
  [core][trusty] add keymaster module
2015-09-16 22:03:18 +00:00
Michael Ryleev c7c9451f98 am ebbbb7c6: Merge "Add libtrusty and corresponding test utility"
* commit 'ebbbb7c677a5c0c269be30ebaf9486513f2f8aff':
  Add libtrusty and corresponding test utility
2015-09-16 22:03:16 +00:00
Yabin Cui c1b1f6ff5d Add unit tests for local socket.
Add has_write_error flag in asocket, so it will not wait on local_socket_closing_list
to write pending packets in local_socket_close(). Although it doesn't fix any problem,
it helps to make the code more stable.
Add a missing put_apacket() in error handling.
Add a check when adding local socket in local_socket_closing_list.

Bug: 23314034

Change-Id: I75b07ba8ee59b7f277fba2fb919db63065b291be
2015-09-16 15:00:59 -07:00
Andres Morales 0e26977c56 Merge changes from topic 'trusty-gk-km''
* changes:
  [core][trusty] add gatekeeper module
  [core][trusty] add keymaster module
2015-09-16 21:58:36 +00:00
Michael Ryleev ebbbb7c677 Merge "Add libtrusty and corresponding test utility" 2015-09-16 21:56:35 +00:00
Andres Morales 6ee0f94adf [core][trusty] add gatekeeper module
Change-Id: I1559a719034a754788d2cfa9a05fa60f36583bbf
2015-09-16 11:31:03 -07:00
Andres Morales 748b690415 [core][trusty] add keymaster module
Change-Id: I7495161a96c7a0652ff3d8318ebe6dab533fe319
2015-09-16 11:30:55 -07:00
Samuel Tan 98a69a0678 am 630e05b6: Merge "metricsd: move timer.h into include/metrics/"
* commit '630e05b6af5f76bd7f063840e543186bde40ff0a':
  metricsd: move timer.h into include/metrics/
2015-09-16 18:30:29 +00:00
Samuel Tan 630e05b6af Merge "metricsd: move timer.h into include/metrics/" 2015-09-16 18:24:15 +00:00
Michael Ryleev 0a72ad9a1d Add libtrusty and corresponding test utility
libtrusty is an interface to Trusty TEE.

Change-Id: I7d53a744010f122257b686247997a8f11a4d480c
2015-09-16 11:15:43 -07:00
Yasuhiro Matsuda f656b683a6 am ada7fa06: Merge "Fix perfboot.py to work with the recent change."
* commit 'ada7fa063e4d8e2b8014a138bdf58d7729ce0ee9':
  Fix perfboot.py to work with the recent change.
2015-09-16 02:49:31 +00:00
Yasuhiro Matsuda ada7fa063e Merge "Fix perfboot.py to work with the recent change." 2015-09-16 02:41:58 +00:00
Yabin Cui c8a5b0b653 am fa965d96: Merge "adb: move adb to poll."
* commit 'fa965d9639dc264bb0d18e71dff998a4f648b50d':
  adb: move adb to poll.
2015-09-15 20:05:02 +00:00
David Pursell 2017030b49 am d9076f21: Merge "adb: Kill subprocess when the client exits."
* commit 'd9076f2132006505227e5fec91926acb512c3d68':
  adb: Kill subprocess when the client exits.
2015-09-15 20:04:58 +00:00
Samuel Tan 1c4d8f10da 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.
2015-09-15 11:52:59 -07:00
Yabin Cui fa965d9639 Merge "adb: move adb to poll." 2015-09-15 18:40:51 +00:00
David Pursell d9076f2132 Merge "adb: Kill subprocess when the client exits." 2015-09-15 18:27:33 +00:00
David Pursell 544e795fbb 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
2015-09-15 10:16:24 -07:00
Yabin Cui a10801674c 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
2015-09-15 10:12:31 -07:00
David Pursell a3ef4fad70 am 0af19a0e: Merge "adb: Fix missing shell protocol usage."
* commit '0af19a0e82d7808678f3b92a8c5b4b8cb80ee216':
  adb: Fix missing shell protocol usage.
2015-09-15 15:12:33 +00:00
David Pursell 0af19a0e82 Merge "adb: Fix missing shell protocol usage." 2015-09-15 15:06:42 +00:00
Yasuhiro Matsuda 6ee194013a 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
2015-09-15 14:00:10 +09:00
Steve Fung 62b37a90c1 am f5974755: Merge "crash_reporter: Add model_manifest_id field to report"
* commit 'f597475599232ace977dcbfca8b5860165b2c281':
  crash_reporter: Add model_manifest_id field to report
2015-09-15 04:52:58 +00:00
Steve Fung f597475599 Merge "crash_reporter: Add model_manifest_id field to report" 2015-09-15 04:47:35 +00:00
Steve Fung 576317af98 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
2015-09-15 01:13:35 +00:00
Steve Fung 33046dcbfa Merge "crash_reporter: Ensure crash_sender spread time is not negative" 2015-09-15 01:06:09 +00:00
Steve Fung ed78930923 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
2015-09-14 16:16:27 -07:00
Bertrand Simonnet c6a66bf1cf am 3ef7f0af: Merge "metricsd: Add test case for the upload service."
* commit '3ef7f0afb86be9473728f4fb3679be0c6f21ff82':
  metricsd: Add test case for the upload service.
2015-09-14 22:53:11 +00:00
Bertrand Simonnet 7ad4171f3c 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.
2015-09-14 22:53:10 +00:00
Bertrand Simonnet 7fb08a74fd am a9f1ed16: Merge "metricsd: Use the metrics directory everywhere."
* commit 'a9f1ed16a839ec4cc974e66734c11a01e8d71820':
  metricsd: Use the metrics directory everywhere.
2015-09-14 22:53:08 +00:00
Bertrand Simonnet 3ef7f0afb8 Merge "metricsd: Add test case for the upload service." 2015-09-14 22:48:39 +00:00
Bertrand Simonnet dd11d286ca Merge "metricsd: Persist the report to disk if an upload fails." 2015-09-14 22:48:32 +00:00
Bertrand Simonnet a9f1ed16a8 Merge "metricsd: Use the metrics directory everywhere." 2015-09-14 22:48:25 +00:00
David Pursell 71c83126a8 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
2015-09-14 15:33:50 -07:00
Steve Fung 18ca9b364b 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
2015-09-14 22:18:24 +00:00
Steve Fung 9179c21705 am 758db4db: Merge "crash_reporter: Read crash server from property"
* commit '758db4dbe7ffc3176c25f615eb306bdeb2be2f50':
  crash_reporter: Read crash server from property
2015-09-14 22:13:58 +00:00
Steve Fung 758db4dbe7 Merge "crash_reporter: Read crash server from property" 2015-09-14 22:06:19 +00:00
Bertrand SIMONNET 4c8a8ad3bf 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
2015-09-14 13:55:33 -07:00
Bertrand SIMONNET 1df10c43ea 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
2015-09-14 13:55:33 -07:00