Commit graph

17906 commits

Author SHA1 Message Date
Bertrand Simonnet
4a014d408d am c1799e33: am 659f5ade: Merge "metricsd: Fix race condition in the tests."
* commit 'c1799e33c60e84d6f4c0cb0beb0f62b6f87600cf':
  metricsd: Fix race condition in the tests.
2015-09-29 18:16:31 +00:00
Bertrand Simonnet
c1799e33c6 am 659f5ade: Merge "metricsd: Fix race condition in the tests."
* commit '659f5ade04a5a07347dfbec9db4ef97636f1ebfe':
  metricsd: Fix race condition in the tests.
2015-09-29 18:10:56 +00:00
Bertrand Simonnet
659f5ade04 Merge "metricsd: Fix race condition in the tests." 2015-09-29 18:07:07 +00:00
Steve Fung
b93ff770dd am 2a186ba2: am 7f16425d: Merge "crash_reporter: Use ro.debuggable for determining developer mode"
* commit '2a186ba25f72564fb7d70418c8499b547ced55b2':
  crash_reporter: Use ro.debuggable for determining developer mode
2015-09-29 17:28:45 +00:00
Steve Fung
716d1bcd65 am 8965f5f1: am 8e7209d4: Merge "crash_reporter: determine official image using ro.secure"
* commit '8965f5f100a031f042fd9ac6b01263785f8a4a92':
  crash_reporter: determine official image using ro.secure
2015-09-29 17:28:43 +00:00
Steve Fung
2a186ba25f am 7f16425d: Merge "crash_reporter: Use ro.debuggable for determining developer mode"
* commit '7f16425d43951ddd188ead30c98876e6943bf7d1':
  crash_reporter: Use ro.debuggable for determining developer mode
2015-09-29 17:21:40 +00:00
Steve Fung
8965f5f100 am 8e7209d4: Merge "crash_reporter: determine official image using ro.secure"
* commit '8e7209d498b4130d21af3a9922a934ff54b13c3f':
  crash_reporter: determine official image using ro.secure
2015-09-29 17:21:38 +00:00
Steve Fung
7f16425d43 Merge "crash_reporter: Use ro.debuggable for determining developer mode" 2015-09-29 17:17:53 +00:00
Steve Fung
8e7209d498 Merge "crash_reporter: determine official image using ro.secure" 2015-09-29 17:17:23 +00:00
Steve Fung
1619214b2c crash_reporter: determine official image using ro.secure
Instead of grepping the build description for "Official", use
the property ro.secure.

Bug: 24404853
Change-Id: Ia0423b3524ac9472db6a782509b56c9834c8d26e
2015-09-29 01:03:35 -07:00
Steve Fung
57c7486bf3 crash_reporter: Use ro.debuggable for determining developer mode
Bug: 24408721
Change-Id: I01215e3794eb787c37cee0c138395f49d2f1d6f8
2015-09-28 18:06:38 -07:00
Scott James Remnant
29a09f50af am 9880f289: am d490db98: Merge "crash_reporter: build on non-Linux hosts"
* commit '9880f2899071a4b0651c6b7436234ae17a079fcd':
  crash_reporter: build on non-Linux hosts
2015-09-28 23:43:46 +00:00
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
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
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
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
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
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
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
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
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