8819cc2356
am 7765a98a: am 900362c3: am 1b2fb587: Merge changes I42162365,Ia72f1305,I57d1f86c,I026d074e
...
* commit '7765a98a90039570f1f47dc61e103f64be4d1ffd':
logd: klogd deal with nuls in dmesg
logd: log_strtok_r deal with nuls
liblog: logprint: printable nul
logd: klogd: sniff for time correction on Mediatek
2015-09-30 20:20:25 +00:00
b62360f378
am 2cfbba97: am 049399e5: am ad2a5a89: Merge "fs_mgr: trigger dm-verity error handling for invalid signatures"
...
* commit '2cfbba9769e4143cefb0d5f3626049e5bd80e4a8':
fs_mgr: trigger dm-verity error handling for invalid signatures
2015-09-30 20:20:23 +00:00
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
2ba96324a4
am 351c211c: am 447356dd: Merge "liblog: logcat: Add year and zone to date on each line"
...
* commit '351c211cc1bba3842c3e9d782888fdeec3adbd24':
liblog: logcat: Add year and zone to date on each line
2015-09-30 20:11:42 +00:00
7765a98a90
am 900362c3: am 1b2fb587: Merge changes I42162365,Ia72f1305,I57d1f86c,I026d074e
...
* commit '900362c36eb531c88d37d8fa57b66c45ed165122':
logd: klogd deal with nuls in dmesg
logd: log_strtok_r deal with nuls
liblog: logprint: printable nul
logd: klogd: sniff for time correction on Mediatek
2015-09-30 20:11:41 +00:00
2cfbba9769
am 049399e5: am ad2a5a89: Merge "fs_mgr: trigger dm-verity error handling for invalid signatures"
...
* commit '049399e570e8aba9ffd83ac88bde0d037e810038':
fs_mgr: trigger dm-verity error handling for invalid signatures
2015-09-30 20:11:39 +00:00
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
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
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
351c211cc1
am 447356dd: Merge "liblog: logcat: Add year and zone to date on each line"
...
* commit '447356ddb4a18cc5899009fcdc450675ab9974bf':
liblog: logcat: Add year and zone to date on each line
2015-09-30 20:04:54 +00:00
900362c36e
am 1b2fb587: Merge changes I42162365,Ia72f1305,I57d1f86c,I026d074e
...
* commit '1b2fb587eb7db6f9de1dda8663b33d87a2f5a27e':
logd: klogd deal with nuls in dmesg
logd: log_strtok_r deal with nuls
liblog: logprint: printable nul
logd: klogd: sniff for time correction on Mediatek
2015-09-30 20:04:53 +00:00
049399e570
am ad2a5a89: Merge "fs_mgr: trigger dm-verity error handling for invalid signatures"
...
* commit 'ad2a5a89a680804b927fc123e952c5bb5e75b9c8':
fs_mgr: trigger dm-verity error handling for invalid signatures
2015-09-30 20:04:51 +00:00
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
447356ddb4
Merge "liblog: logcat: Add year and zone to date on each line"
2015-09-30 18:56:48 +00:00
1b2fb587eb
Merge changes I42162365,Ia72f1305,I57d1f86c,I026d074e
...
* changes:
logd: klogd deal with nuls in dmesg
logd: log_strtok_r deal with nuls
liblog: logprint: printable nul
logd: klogd: sniff for time correction on Mediatek
2015-09-30 18:55:21 +00:00
0e7fb13d57
libutils: fix compile error in SharedBufferTest
...
Change-Id: Ib1185d417457d03efa102989a64b5b5e4eb5c82a
2015-09-30 10:44:17 -07:00
ad2a5a89a6
Merge "fs_mgr: trigger dm-verity error handling for invalid signatures"
2015-09-30 16:38:11 +00:00
e045333445
Merge "system/core: remove methods returning SharedBuffer in String8, String16"
2015-09-30 15:21:48 +00:00
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
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
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
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
730fdbb1ca
Merge "system/core: change LruCache to use unordered_set instead of BasicHashTable"
2015-09-30 13:15:21 +00:00
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
18395cb507
Ignore explicit infinite recursion.
...
Clang 3.8 warns against this now, and it is tripping up part of a test.
We suppress the warning, since we are trying to actually test that this
behavior is properly handled.
Change-Id: I8705900572e1a6704bbdc001fece3e2d16c7077c
2015-09-29 23:55:14 -07:00
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
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
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
8ec2d8fec6
Merge "logd: klogd and Mediatek part deux"
2015-09-30 00:01:48 +00:00
151beac76d
logd: klogd deal with nuls in dmesg
...
Switch to using string and length in all transactions, treating
trailing nuls the same as spaces.
ToDo: change dumpstate (bugreport) to use logcat -b printable _regardless_
Bug: 23517551
Change-Id: I42162365e6bf8ed79d356e7b689a673902116fdb
2015-09-29 15:51:38 -07:00
ea1a241107
logd: log_strtok_r deal with nuls
...
Rename to log_strntok_r and change from dealing with strings
to dealing with a string and an associated length.
Bug: 23517551
Change-Id: Ia72f1305a53f55eeef9861ac378fb8205fd2378e
2015-09-29 15:43:34 -07:00
faa92e9915
liblog: logprint: printable nul
...
Change-Id: I57d1f86ce040ad196c558bb72ac0464af793c214
2015-09-29 15:43:34 -07:00
2d159bf3b5
logd: klogd: sniff for time correction on Mediatek
...
Need some more flexibility when parsing kernel messages
cluttered with extra fluff. This is the minimal relaxation
we can do to the rules to ensure that we work on all
possible devices and kernels when sniffing for time
correction information.
We want to minimize any future maintenance, keep in mind
klogd is a "userdebug" or "eng" feature and is disabled
in "user" builds. Manage expectations.
Bug: 23517551
Change-Id: I026d074e14fb2550e728683e85a973bd87e78a9c
2015-09-29 15:43:07 -07:00
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
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
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
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
659f5ade04
Merge "metricsd: Fix race condition in the tests."
2015-09-29 18:07:07 +00:00
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
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
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
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
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
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
7f16425d43
Merge "crash_reporter: Use ro.debuggable for determining developer mode"
2015-09-29 17:17:53 +00:00
8e7209d498
Merge "crash_reporter: determine official image using ro.secure"
2015-09-29 17:17:23 +00:00
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
57c7486bf3
crash_reporter: Use ro.debuggable for determining developer mode
...
Bug: 24408721
Change-Id: I01215e3794eb787c37cee0c138395f49d2f1d6f8
2015-09-28 18:06:38 -07:00
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
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
Mark Salyzyn