Commit Graph

18969 Commits

Author SHA1 Message Date
Scott James Remnant 9880f28990 am d490db98: Merge "crash_reporter: build on non-Linux hosts"
* commit 'd490db9824cdb4974da22ba80399f39a8b44ec08':
  crash_reporter: build on non-Linux hosts
2015-09-28 23:36:38 +00:00
Scott James Remnant d490db9824 Merge "crash_reporter: build on non-Linux hosts" 2015-09-28 23:14:15 +00:00
Scott James Remnant f86037127d am 3d80ee72: am 14e61ffe: am b4f47a30: Merge "metricsd: build on non-Linux hosts"
* commit '3d80ee721ed85cfdd279037923d78bb2e2d95946':
  metricsd: build on non-Linux hosts
2015-09-28 22:30:49 +00:00
Scott James Remnant 3d80ee721e am 14e61ffe: am b4f47a30: Merge "metricsd: build on non-Linux hosts"
* commit '14e61ffeb820e436f73c6f6e1c4269094eaf3b47':
  metricsd: build on non-Linux hosts
2015-09-28 22:26:31 +00:00
Scott James Remnant 14e61ffeb8 am b4f47a30: Merge "metricsd: build on non-Linux hosts"
* commit 'b4f47a30e9706561900060ed7e043d3475779922':
  metricsd: build on non-Linux hosts
2015-09-28 22:18:43 +00:00
Scott James Remnant b4f47a30e9 Merge "metricsd: build on non-Linux hosts" 2015-09-28 22:15:17 +00:00
Scott James Remnant 480a07db27 crash_reporter: build on non-Linux hosts
BUG=24073089

Change-Id: Ica4593074b8860e77e799e5d5347a21e49893919
2015-09-28 15:12:33 -07:00
Scott James Remnant 7c5d693fe9 metricsd: build on non-Linux hosts
Bug: 24073089
Change-Id: I94f12f0e30d150348429a959b7bd1c869f766603
2015-09-28 15:12:30 -07:00
Bertrand SIMONNET 3598d951a6 metricsd: Fix race condition in the tests.
We cached the enabled status for metrics as a static field in the
metrics library. This field is not reset in between tests which treats
the metrics as enabled if they were enabled previously.

None of the users rely on the caching being static so the cached status
was changed into a field.
Also enabled the metrics in upload_service_test.cc after verifying that
the test failed consistently.

BUG: 24473349
TEST: unit tests.

Change-Id: If05fdca644016d923aa7b1978db5e74ada563c1a
2015-09-28 15:02:00 -07:00
Jorge Lucangeli Obes 6c039ed0af am 0377490a: am f4a0dc56: am e6a7a2cb: Merge "Simplify Makefile for crash_reporter."
* commit '0377490ad80a6732d34929d0cff578fd63a671c5':
  Simplify Makefile for crash_reporter.
2015-09-28 20:32:47 +00:00
Jorge Lucangeli Obes 0377490ad8 am f4a0dc56: am e6a7a2cb: Merge "Simplify Makefile for crash_reporter."
* commit 'f4a0dc5698cd6b044da378c4210e32afb893a6ae':
  Simplify Makefile for crash_reporter.
2015-09-28 20:26:34 +00:00
Jorge Lucangeli Obes f4a0dc5698 am e6a7a2cb: Merge "Simplify Makefile for crash_reporter."
* commit 'e6a7a2cb26bf4d74c98b187284c9d905f5cde773':
  Simplify Makefile for crash_reporter.
2015-09-28 20:20:27 +00:00
Jorge Lucangeli Obes e6a7a2cb26 Merge "Simplify Makefile for crash_reporter." 2015-09-28 20:04:32 +00:00
Jorge Lucangeli Obes 20d12a69ef am 8b40de57: am 89d43388: am 5da11673: Merge "Simplify Makefile for metrics_daemon."
* commit '8b40de57bf3a3271b42871beb1fa4ae25b560a0f':
  Simplify Makefile for metrics_daemon.
2015-09-28 20:02:18 +00:00
Jorge Lucangeli Obes 8b40de57bf am 89d43388: am 5da11673: Merge "Simplify Makefile for metrics_daemon."
* commit '89d4338876a525e0ea92ffab20cf964b6d0a53c5':
  Simplify Makefile for metrics_daemon.
2015-09-28 19:53:45 +00:00
Jorge Lucangeli Obes 96408df204 Simplify Makefile for crash_reporter.
We can use the LOCAL_INIT_RC variable for init.rc files.

Also, switch to use <service>.rc for the filename, since this is what
Android does now.

Bug: 24465893
Change-Id: I924acbe758ba9994020093005e27c8c06d0686ff
2015-09-28 12:51:54 -07:00
Jorge Lucangeli Obes 89d4338876 am 5da11673: Merge "Simplify Makefile for metrics_daemon."
* commit '5da116737196dc2c4afad2ff22aa274e4e7c0932':
  Simplify Makefile for metrics_daemon.
2015-09-28 19:49:24 +00:00
Jorge Lucangeli Obes 5da1167371 Merge "Simplify Makefile for metrics_daemon." 2015-09-28 19:33:31 +00:00
Dimitry Ivanov 2fc3f6eaf1 am de95de7c: am 5d280a58: am 8bed8749: Merge "Fix bug number for linker related workarounds"
* commit 'de95de7cab46ad500ff6c8e3d5da98ba1379df92':
  Fix bug number for linker related workarounds
2015-09-28 18:50:32 +00:00
Dimitry Ivanov de95de7cab am 5d280a58: am 8bed8749: Merge "Fix bug number for linker related workarounds"
* commit '5d280a58a998eef06ea7d01bd5023b44fc42f19d':
  Fix bug number for linker related workarounds
2015-09-28 18:33:57 +00:00
Jorge Lucangeli Obes 9341286385 Simplify Makefile for metrics_daemon.
We can use the LOCAL_INIT_RC variable for init.rc files.

Also, switch to use <service>.rc for the filename, since this is what
Android does now.

Bug: 24465893
Change-Id: Ibf4715c3b0352422b98afc04abfd68a42a46149c
2015-09-28 11:31:58 -07:00
Dimitry Ivanov 5d280a58a9 am 8bed8749: Merge "Fix bug number for linker related workarounds"
* commit '8bed8749ea8b142f3653344b0c8a5de667165bbb':
  Fix bug number for linker related workarounds
2015-09-28 18:23:45 +00:00
Dimitry Ivanov 8bed8749ea Merge "Fix bug number for linker related workarounds" 2015-09-28 17:55:43 +00:00
Dmitriy Ivanov 58558a59c9 Fix bug number for linker related workarounds
Bug: http:/b/24425865
Change-Id: I87e1af3cf39b5234647ecbbd5844c9d88eeb9200
2015-09-28 10:40:35 -07:00
Bertrand Simonnet a1bb80175d am bcf6030f: am 850cf464: am 12ede133: Merge "metricsd: Update the daily/weekly metrics name."
* commit 'bcf6030f57165f86b28c144608971c9320628823':
  metricsd: Update the daily/weekly metrics name.
2015-09-28 17:20:36 +00:00
Bertrand Simonnet bcf6030f57 am 850cf464: am 12ede133: Merge "metricsd: Update the daily/weekly metrics name."
* commit '850cf464b69266acb20194d8190cbe051125d949':
  metricsd: Update the daily/weekly metrics name.
2015-09-28 17:13:45 +00:00
Bertrand Simonnet 850cf464b6 am 12ede133: Merge "metricsd: Update the daily/weekly metrics name."
* commit '12ede1332a5ec0f2dd11732bf2162156e06684b8':
  metricsd: Update the daily/weekly metrics name.
2015-09-28 17:06:43 +00:00
Bertrand Simonnet 12ede1332a Merge "metricsd: Update the daily/weekly metrics name." 2015-09-28 17:00:37 +00:00
David Pursell 4b73c96513 am 88b71d41: am edf0728e: am a36f4d68: Merge "adb: bump server version to prevent feature mismatch."
* commit '88b71d41af2042037a3a82b317bc564a0a20245e':
  adb: bump server version to prevent feature mismatch.
2015-09-28 16:19:41 +00:00
David Pursell 4291cb9dc7 am 0f427fea: am 5d1a943d: am 002f9d5c: Merge "adb: fix adbd feature parsing for no features."
* commit '0f427fead774fc3b45aba826cbbaff60945a38cd':
  adb: fix adbd feature parsing for no features.
2015-09-28 16:19:40 +00:00
David Pursell 88b71d41af am edf0728e: am a36f4d68: Merge "adb: bump server version to prevent feature mismatch."
* commit 'edf0728e2de358bc1a0eb73626c2c7788a3cc808':
  adb: bump server version to prevent feature mismatch.
2015-09-28 16:14:32 +00:00
David Pursell 0f427fead7 am 5d1a943d: am 002f9d5c: Merge "adb: fix adbd feature parsing for no features."
* commit '5d1a943dc49dcb1513d64e281efb522d704dea02':
  adb: fix adbd feature parsing for no features.
2015-09-28 16:14:30 +00:00
Sami Tolvanen 8ad7c20f3c am 8e0db822: am c6ca7a5a: am eccf0a45: Merge "utils: add pwrite64 to Compat.h for Mac"
* commit '8e0db822d82a64a12de920452eb532c5bf77ea73':
  utils: add pwrite64 to Compat.h for Mac
2015-09-28 16:14:05 +00:00
Sami Tolvanen 8e0db822d8 am c6ca7a5a: am eccf0a45: Merge "utils: add pwrite64 to Compat.h for Mac"
* commit 'c6ca7a5a31e07e26dac45fe0d8199fd75be721f3':
  utils: add pwrite64 to Compat.h for Mac
2015-09-28 16:06:42 +00:00
David Pursell edf0728e2d am a36f4d68: Merge "adb: bump server version to prevent feature mismatch."
* commit 'a36f4d680a02dbf2bf2166f148f4c5200ec1d8f4':
  adb: bump server version to prevent feature mismatch.
2015-09-28 16:06:24 +00:00
David Pursell 5d1a943dc4 am 002f9d5c: Merge "adb: fix adbd feature parsing for no features."
* commit '002f9d5c70058e8db78a61d65384fd9510cf4ffd':
  adb: fix adbd feature parsing for no features.
2015-09-28 16:06:22 +00:00
David Pursell a36f4d680a Merge "adb: bump server version to prevent feature mismatch." 2015-09-28 16:03:21 +00:00
Sami Tolvanen c6ca7a5a31 am eccf0a45: Merge "utils: add pwrite64 to Compat.h for Mac"
* commit 'eccf0a4502293d628152888be85d1cd6fa0b4751':
  utils: add pwrite64 to Compat.h for Mac
2015-09-28 16:02:35 +00:00
David Pursell 002f9d5c70 Merge "adb: fix adbd feature parsing for no features." 2015-09-28 16:02:10 +00:00
Mark Salyzyn d80ddaabe1 am 936d65f5: am cb2ab20d: am 87122ce1: Merge "logd: increase dgram_max_qlen to 600"
* commit '936d65f59bbab071898390c8bd6982055be5ab4b':
  logd: increase dgram_max_qlen to 600
2015-09-28 15:58:30 +00:00
Sami Tolvanen eccf0a4502 Merge "utils: add pwrite64 to Compat.h for Mac" 2015-09-28 15:56:25 +00:00
Mark Salyzyn 936d65f59b am cb2ab20d: am 87122ce1: Merge "logd: increase dgram_max_qlen to 600"
* commit 'cb2ab20d480cdf488e5b5bf37dc55ca7f0ddee67':
  logd: increase dgram_max_qlen to 600
2015-09-28 15:54:05 +00:00
Sami Tolvanen 8731d30085 utils: add pwrite64 to Compat.h for Mac
Compat.h has lseek64 and pread64, but it's missing pwrite64.

Change-Id: I02b4adf5a5e15e55e008ff1ba8113a75faf1c4e9
2015-09-28 16:52:38 +01:00
Mark Salyzyn cb2ab20d48 am 87122ce1: Merge "logd: increase dgram_max_qlen to 600"
* commit '87122ce1d60dd6fbc18e747d976db734d502f2bf':
  logd: increase dgram_max_qlen to 600
2015-09-28 15:50:02 +00:00
Mark Salyzyn 87122ce1d6 Merge "logd: increase dgram_max_qlen to 600" 2015-09-28 15:43:12 +00:00
Bertrand SIMONNET 5066a45a42 metricsd: Update the daily/weekly metrics name.
Instead of using daily, weekly, the daily/weekly metrics should use
.PerDay and .PerWeek to be consistent with other metrics' names.

BUG: 24412660
Change-Id: I05541c8de269a717a8d3f2d74b7633c3949df3f1
2015-09-25 15:38:42 -07:00
David Pursell d2b588e239 adb: fix adbd feature parsing for no features.
Previously the transport features list was only overwritten if a
new feature list was found. However, adbd can reuse the same atransport
object even if the adb server is killed and restarted, so the feature
list was not cleared properly if the newly started adb server didn't
provide one.

This CL fixes the bug by clearing the transport features list whenever
a connection banner is parsed.

Bug: http://b/24405971
Change-Id: Ia6ee6c9a46a621534681f6d4d7df77156b885eb9
2015-09-25 13:10:17 -07:00
David Pursell bbe3d210ba adb: bump server version to prevent feature mismatch.
Devices get a list of supported features from the adb server, not the
client, so a mismatch between client and server features can cause the
device to use an incorrect feature set.

Bumping the server version is the easiest way to make sure the client
and server features match and seems like the best solution at the
moment.

A more automated fix could be to compare client/server features on each
connection and restart if they don't match. This requires an extra
client <-> server round-trip per command, but removes the need to
manually bump the server version number on feature change. Unless the
feature set changes often it didn't seem worth the extra overhead.

Bug: http://b/24370690
Change-Id: I4e43825d1c15c61e5d924fc8d4110b467debde37
2015-09-25 09:59:31 -07:00
Mark Salyzyn 39944c89a9 logd: increase dgram_max_qlen to 600
Seeing liblog messages on system_server runtime restart
(too much system_server spam, 566 messages in 72ms)

Bug: 23788621
Change-Id: I5171f2c19a3538da190fc6c2b40e978d89bf0e20
2015-09-25 14:15:53 +00:00
Sami Tolvanen 1ada14904d fs_mgr: trigger dm-verity error handling for invalid signatures
Currently, the device doesn't mount verified partitions if the
verity table signature is invalid, which usually means it fails to
boot. This change instead sets up dm-verity with an invalid root
hash and triggers device-specific error handling to recover from
the corruption.

Bug: 24256506
Change-Id: I6d693306fa0e7459c5500b028e433df61ecea6fb
(cherry picked from commit 47caa5c386)
2015-09-25 15:01:33 +01:00