Sergio Giro
58a25053c6
am c559a9b5
: am b5a00d6b
: am e0453334
: Merge "system/core: remove methods returning SharedBuffer in String8, String16"
...
* commit 'c559a9b52fe79c5be32121f8f82c672a5eac94ef':
system/core: remove methods returning SharedBuffer in String8, String16
2015-09-30 20:20:21 +00:00
Sergio Giro
c559a9b52f
am b5a00d6b
: am e0453334
: Merge "system/core: remove methods returning SharedBuffer in String8, String16"
...
* commit 'b5a00d6b2e9a386701cf9f3f5997837496a5aa57':
system/core: remove methods returning SharedBuffer in String8, String16
2015-09-30 20:11:38 +00:00
Sergio Giro
845ce5fc9a
am 1807801e
: am 0e7fb13d
: libutils: fix compile error in SharedBufferTest
...
* commit '1807801edacbf0ba9881bdf35fc0e63d0985dcf3':
libutils: fix compile error in SharedBufferTest
2015-09-30 20:11:03 +00:00
Sergio Giro
1807801eda
am 0e7fb13d
: libutils: fix compile error in SharedBufferTest
...
* commit '0e7fb13d57d50ebf104943b2dc720a40c3fc284d':
libutils: fix compile error in SharedBufferTest
2015-09-30 20:05:17 +00:00
Sergio Giro
b5a00d6b2e
am e0453334
: Merge "system/core: remove methods returning SharedBuffer in String8, String16"
...
* commit 'e045333445ab3ebb8d602d25ed750169f135baa6':
system/core: remove methods returning SharedBuffer in String8, String16
2015-09-30 20:04:50 +00:00
Sergio Giro
0e7fb13d57
libutils: fix compile error in SharedBufferTest
...
Change-Id: Ib1185d417457d03efa102989a64b5b5e4eb5c82a
2015-09-30 10:44:17 -07:00
Sergio Giro
e045333445
Merge "system/core: remove methods returning SharedBuffer in String8, String16"
2015-09-30 15:21:48 +00:00
Sergio Giro
282efae9c3
system/core: remove methods returning SharedBuffer in String8, String16
...
Towards deprecation of SharedBuffer
Change-Id: I3069837db32837bcc0f5d8f1118ccd502c9070dc
2015-09-30 15:42:02 +01:00
Sergio Giro
9428978318
am fbb259e8
: am 8e2c8208
: am 730fdbb1
: Merge "system/core: change LruCache to use unordered_set instead of BasicHashTable"
...
* commit 'fbb259e83633c35c5e6ede1d5f55f5672ab433d0':
system/core: change LruCache to use unordered_set instead of BasicHashTable
2015-09-30 13:31:45 +00:00
Sergio Giro
fbb259e836
am 8e2c8208
: am 730fdbb1
: Merge "system/core: change LruCache to use unordered_set instead of BasicHashTable"
...
* commit '8e2c8208198c1c73c7192b1bd5e87868b53297c6':
system/core: change LruCache to use unordered_set instead of BasicHashTable
2015-09-30 13:26:23 +00:00
Sergio Giro
8e2c820819
am 730fdbb1
: Merge "system/core: change LruCache to use unordered_set instead of BasicHashTable"
...
* commit '730fdbb1ca4c39a4d69868f7a261b023f2bea296':
system/core: change LruCache to use unordered_set instead of BasicHashTable
2015-09-30 13:20:02 +00:00
Sergio Giro
730fdbb1ca
Merge "system/core: change LruCache to use unordered_set instead of BasicHashTable"
2015-09-30 13:15:21 +00:00
Sergio Giro
bb58cde899
system/core: change LruCache to use unordered_set instead of BasicHashTable
...
Towards deprecation of BasicHashTable
Change-Id: I3f3d904636a85a794cccf972f6e4a94e7f3808f5
2015-09-30 13:48:30 +01:00
Mark Salyzyn
57d81f60c6
am 78e4de58
: am db364d25
: am 8ec2d8fe
: Merge "logd: klogd and Mediatek part deux"
...
* commit '78e4de58990eb83402a9d2f81f9d0ec09523b0b8':
logd: klogd and Mediatek part deux
2015-09-30 00:17:27 +00:00
Mark Salyzyn
78e4de5899
am db364d25
: am 8ec2d8fe
: Merge "logd: klogd and Mediatek part deux"
...
* commit 'db364d251fd72b9689e7573811f6108d9205a4ff':
logd: klogd and Mediatek part deux
2015-09-30 00:11:21 +00:00
Mark Salyzyn
db364d251f
am 8ec2d8fe
: Merge "logd: klogd and Mediatek part deux"
...
* commit '8ec2d8fec6d099d44151b1e29366002e569d3c2a':
logd: klogd and Mediatek part deux
2015-09-30 00:05:41 +00:00
Mark Salyzyn
8ec2d8fec6
Merge "logd: klogd and Mediatek part deux"
2015-09-30 00:01:48 +00:00
Mark Salyzyn
47dba71f24
logd: klogd and Mediatek part deux
...
- switch to an open coded strnrchr
- validity checking on n, taglen and b values.
Bug: 23517551
Change-Id: I568e25c5aa6d8474835454a0e83b19c2921b7986
2015-09-29 15:40:08 -07:00
Bertrand Simonnet
ea86cdea40
am 4a014d40
: am c1799e33
: am 659f5ade
: Merge "metricsd: Fix race condition in the tests."
...
* commit '4a014d408d20ce8b592c702fb57ad2a8958bd5a9':
metricsd: Fix race condition in the tests.
2015-09-29 18:22:36 +00:00
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
2f997784ea
am b93ff770
: am 2a186ba2
: am 7f16425d
: Merge "crash_reporter: Use ro.debuggable for determining developer mode"
...
* commit 'b93ff770dd18c9d3dad564b8dd7dba3f0c8a8bf9':
crash_reporter: Use ro.debuggable for determining developer mode
2015-09-29 17:34:39 +00:00
Steve Fung
9686e3bd0d
am 716d1bcd
: am 8965f5f1
: am 8e7209d4
: Merge "crash_reporter: determine official image using ro.secure"
...
* commit '716d1bcd659df5c60697b3e5dc4c7e079da64136':
crash_reporter: determine official image using ro.secure
2015-09-29 17:34:38 +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
ac16c39802
am 29a09f50
: am 9880f289
: am d490db98
: Merge "crash_reporter: build on non-Linux hosts"
...
* commit '29a09f50afd67ef0444761a85099293502b7d1cd':
crash_reporter: build on non-Linux hosts
2015-09-28 23:50:11 +00: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
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