Commit graph

16287 commits

Author SHA1 Message Date
Gaurav Shah
594e128fd2 am fb44650a: am dc15f4cd: Merge "metrics: Enable for non-official builds."
* commit 'fb44650a03df364f8f46a9fe1c96b6a2321c2044':
  metrics: Enable for non-official builds.
2015-08-10 22:54:22 +00:00
Gaurav Shah
fb44650a03 am dc15f4cd: Merge "metrics: Enable for non-official builds."
* commit 'dc15f4cd926a35e4b2f85804fbad218a90365abe':
  metrics: Enable for non-official builds.
2015-08-10 22:45:06 +00:00
Gaurav Shah
dc15f4cd92 Merge "metrics: Enable for non-official builds." 2015-08-10 22:40:32 +00:00
Steve Fung
de0bc2a23b am b949867c: am 855b618f: Merge "crash_reporter: Fix header include paths"
* commit 'b949867c14bc3fa756549c98f5a446412b299c40':
  crash_reporter: Fix header include paths
2015-08-10 22:33:40 +00:00
Steve Fung
b949867c14 am 855b618f: Merge "crash_reporter: Fix header include paths"
* commit '855b618fbabc032f3ba1eb2232e1766e76298cba':
  crash_reporter: Fix header include paths
2015-08-10 22:27:00 +00:00
Bertrand SIMONNET
bae5dcce9b metrics: Enable for non-official builds.
The metrics uploader used to be disabled for non-official images to
avoid polluting the production data with possibly wrong measurements.
This is inconvenient for developers as they can only be sure that a new
metric was added properly until the changes reached a product device.

Instead, this CL change the metrics daemon to upload metrics iff the
consent file exists.
To ensure that testing data does not pollute the production data, we set
the channel to UNKNOWN and the version to 0.0.0.0 when the image is not
official (implied by channel and version missing).

BUG: 22879597

Change-Id: If03847090b732cc06270cbcc8b386b5f9e544a3d
2015-08-10 15:26:01 -07:00
Steve Fung
855b618fba Merge "crash_reporter: Fix header include paths" 2015-08-10 22:17:31 +00:00
Bertrand Simonnet
c6087a2ddb am 7d41a8c8: am 6ada1665: Merge "metrics: Remove send to autotest."
* commit '7d41a8c8d0bfec11e4c1b06f7e9b41cd15a59d18':
  metrics: Remove send to autotest.
2015-08-10 21:53:56 +00:00
Bertrand Simonnet
a3400a2c7a am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h."
* commit '1ed51e429a5f1d3430cd1cdf243f6db1e998c7b8':
  metrics: Consolidate constants in constants.h.
2015-08-10 21:53:54 +00:00
Bertrand Simonnet
7d41a8c8d0 am 6ada1665: Merge "metrics: Remove send to autotest."
* commit '6ada1665c9b3f6ffea34d0c15ba9be96d7ff58a8':
  metrics: Remove send to autotest.
2015-08-10 21:47:10 +00:00
Bertrand Simonnet
1ed51e429a am 9372228f: Merge "metrics: Consolidate constants in constants.h."
* commit '9372228f4eb387a6919e95627539cd6776d1dc6c':
  metrics: Consolidate constants in constants.h.
2015-08-10 21:47:09 +00:00
Bertrand Simonnet
6ada1665c9 Merge "metrics: Remove send to autotest." 2015-08-10 21:43:07 +00:00
Bertrand Simonnet
9372228f4e Merge "metrics: Consolidate constants in constants.h." 2015-08-10 21:42:49 +00:00
Bertrand Simonnet
7c2696630f am f69a27f8: am 182673ec: Merge "metrics: Cleanup the system profile setter."
* commit 'f69a27f80e461a435a260dbee0c1550df49aca78':
  metrics: Cleanup the system profile setter.
2015-08-10 21:42:40 +00:00
Bertrand Simonnet
077a839bd7 am 73e5c768: am 38f55079: Merge "metrics: Disable stat collection."
* commit '73e5c7680a11f1a53db958be14232e8843e9c9cc':
  metrics: Disable stat collection.
2015-08-10 21:42:39 +00:00
Bertrand SIMONNET
475dfa6891 metrics: Remove send to autotest.
This code is no longer used and can be removed.

BUG: 22879597

Change-Id: I59a51597f4c3699aa7952b0553144ad0ee03ebde
2015-08-10 14:42:03 -07:00
Bertrand SIMONNET
bd3505e634 metrics: Consolidate constants in constants.h.
Instead of hardcoding system specific constants (like path) in
every file, consolidate them into the constants.h.

BUG: 22879597

Change-Id: I615be017774db629bf43398db7f70e9ef7263a52
2015-08-10 14:42:03 -07:00
Bertrand Simonnet
f69a27f80e am 182673ec: Merge "metrics: Cleanup the system profile setter."
* commit '182673ec6cd7538661cc76a984cded725d03f456':
  metrics: Cleanup the system profile setter.
2015-08-10 21:33:01 +00:00
Bertrand Simonnet
73e5c7680a am 38f55079: Merge "metrics: Disable stat collection."
* commit '38f55079aaefd339ce7b851323be4c9d7f0c01b8':
  metrics: Disable stat collection.
2015-08-10 21:33:00 +00:00
Bertrand Simonnet
182673ec6c Merge "metrics: Cleanup the system profile setter." 2015-08-10 21:28:16 +00:00
Bertrand Simonnet
38f55079aa Merge "metrics: Disable stat collection." 2015-08-10 21:27:52 +00:00
Bertrand SIMONNET
52e1d55fd2 metrics: Cleanup the system profile setter.
Android does not use some of the original mechanisms available in Chrome
OS, so simplify the code by removing them.

BUG: 22879597

Change-Id: I25d71f464cb99d4ca51eab758695fcd59c1d2f3d
2015-08-10 21:23:28 +00:00
Bertrand SIMONNET
eeb7ef0284 metrics: Disable stat collection.
The statistics collected might not be correct on android.
We should make sure that the values reported have the right meaning.

BUG: 22879597
BUG: 22953719

Change-Id: I9fb066333a07f43096bd54a16fcc83816248cc29
2015-08-10 13:31:53 -07:00
Bertrand Simonnet
225660dd7b am 1cdf6e94: am d16e9c25: Merge "metrics: Don\'t use the policy file."
* commit '1cdf6e947231a308af50f27de4708a07b685974f':
  metrics: Don't use the policy file.
2015-08-10 17:58:13 +00:00
Bertrand Simonnet
fa1db65469 am a8b959bb: am 932d61d9: Merge "metrics: Fix import paths for headers."
* commit 'a8b959bb919366e99804f8f93bbb4511ee97d34c':
  metrics: Fix import paths for headers.
2015-08-10 17:58:12 +00:00
Bertrand Simonnet
1cdf6e9472 am d16e9c25: Merge "metrics: Don\'t use the policy file."
* commit 'd16e9c254ee22fdfbe76d9ee3e6f230002c5c170':
  metrics: Don't use the policy file.
2015-08-10 17:51:20 +00:00
Bertrand Simonnet
a8b959bb91 am 932d61d9: Merge "metrics: Fix import paths for headers."
* commit '932d61d9ae1f5ede45702c381694880cfb6d700b':
  metrics: Fix import paths for headers.
2015-08-10 17:51:18 +00:00
Bertrand Simonnet
d16e9c254e Merge "metrics: Don't use the policy file." 2015-08-10 17:45:18 +00:00
Bertrand Simonnet
932d61d9ae Merge "metrics: Fix import paths for headers." 2015-08-10 17:44:56 +00:00
Steve Fung
129bea543b crash_reporter: Fix header include paths
Fix the header include paths to be relative to the crash_reporter
base folder.

Bug: 22873331
Change-Id: Icdd0495a79cd7679f38c54a84e189bfb3c9d7f1c
2015-08-10 01:38:56 -07:00
Tom Cherry
841066e778 am 4036f5ab: am 4bf3dc93: Merge "Create Service and ServiceManager classes"
* commit '4036f5ab2ffbe5a2e47d46aa376e9791385cc31b':
  Create Service and ServiceManager classes
2015-08-07 21:17:02 +00:00
Elliott Hughes
184585c417 am af60acef: am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK"
* commit 'af60acef8231f03f7c736ed8ce86bd59979f9f6c':
  adb start-server: Use a separate fd for sending initial OK
2015-08-07 21:17:00 +00:00
Elliott Hughes
16059f762d am c5cacda5: am 847ec9a8: Merge "More Mac fastboot failure debugging."
* commit 'c5cacda57272a1dfb9cbd14390fdbd893391673a':
  More Mac fastboot failure debugging.
2015-08-07 21:16:58 +00:00
Bertrand SIMONNET
5db66c3859 metrics: Don't use the policy file.
Android does not have any policy file. Instead, rely only on the
existence of the consent file to determine whether the metrics are
enabled or not.

BUG: 22879597

Change-Id: I7e628f09d623c97b9bab3a490a636db873230817
2015-08-07 13:39:19 -07:00
Bertrand SIMONNET
4b915ae1b2 metrics: Fix import paths for headers.
This CL fixes the import path to match the Android format.
The libmetrics headers were also moved to include/metrics to make
exporting headers cleaner.

BUG: 22879597

Change-Id: I67d1ac1746cc3560ae4cbddecf97fa48c9dd1480
2015-08-07 13:39:14 -07:00
Elliott Hughes
a4a902432e am c1b6378d: am e1101677: Merge "adb: fix killing of old version of adb process"
* commit 'c1b6378d96dda18f1a6b9d9cf33f9ed4eb6f6603':
  adb: fix killing of old version of adb process
2015-08-07 20:21:02 +00:00
Elliott Hughes
08fe47e3bd am c6195530: am db3492cf: Merge "win32: adb_test/libbase_test fixes"
* commit 'c61955305e4e6b222801e694af9d578b39485ac5':
  win32: adb_test/libbase_test fixes
2015-08-07 20:20:59 +00:00
Tom Cherry
4036f5ab2f am 4bf3dc93: Merge "Create Service and ServiceManager classes"
* commit '4bf3dc9345dcbadd79d26406c0c33e0c4a16ce29':
  Create Service and ServiceManager classes
2015-08-07 19:36:38 +00:00
Tom Cherry
4bf3dc9345 Merge "Create Service and ServiceManager classes" 2015-08-07 19:29:58 +00:00
Elliott Hughes
af60acef82 am 98714882: Merge "adb start-server: Use a separate fd for sending initial OK"
* commit '9871488223b5bd8f08f4a22920057297f942f94a':
  adb start-server: Use a separate fd for sending initial OK
2015-08-07 19:11:32 +00:00
Elliott Hughes
c5cacda572 am 847ec9a8: Merge "More Mac fastboot failure debugging."
* commit '847ec9a88fdae3364b5124e505abc16fa4036d6a':
  More Mac fastboot failure debugging.
2015-08-07 19:11:31 +00:00
Elliott Hughes
9871488223 Merge "adb start-server: Use a separate fd for sending initial OK" 2015-08-07 18:31:49 +00:00
Siva Velusamy
9f2d1a9cfc adb start-server: Use a separate fd for sending initial OK
When "adb start-server" is issued, and a server needs to be launched,
adb client forks itself and the child process runs the server routine.
Once the server initializes its various components, it sends an "OK\n"
back to the client via its stderror (or stdout on Windows).

This sequence breaks down if before sending the "OK\n", the server
happens to log something on its stderr. In order to avoid this, the
client now expects the ack to come on a different fd rather than one
of the standard streams.

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

Change-Id: I9d58a08068d71eb3b77e8a7377e934631c016466
2015-08-07 11:31:07 -07:00
Elliott Hughes
847ec9a88f Merge "More Mac fastboot failure debugging." 2015-08-07 18:17:19 +00:00
Elliott Hughes
2ae8d2ebae More Mac fastboot failure debugging.
Bug: http://b/22829602
Change-Id: I27738883eb545ed72eaae55fe3a077e6d1421302
2015-08-07 10:49:36 -07:00
Tom Cherry
bac3299720 Create Service and ServiceManager classes
Change-Id: I363a5e4751ad83d2f4096882a6fbbeddca03acfe
2015-08-07 10:16:39 -07:00
Elliott Hughes
c1b6378d96 am e1101677: Merge "adb: fix killing of old version of adb process"
* commit 'e1101677eabaaddc2a60c6456cce1fd5e38f5b4e':
  adb: fix killing of old version of adb process
2015-08-07 03:10:57 +00:00
Elliott Hughes
e1101677ea Merge "adb: fix killing of old version of adb process" 2015-08-07 03:04:30 +00:00
Elliott Hughes
c61955305e am db3492cf: Merge "win32: adb_test/libbase_test fixes"
* commit 'db3492cf1703e15a1e92218fe00291932780656f':
  win32: adb_test/libbase_test fixes
2015-08-07 01:43:34 +00:00
Elliott Hughes
db3492cf17 Merge "win32: adb_test/libbase_test fixes" 2015-08-07 01:36:03 +00:00