Mark Salyzyn
784b39483f
Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
...
am: 56efe020b7
Change-Id: I3dceee794572d94af13226f6af0eab0e465d6be8
2016-07-22 04:09:37 +00:00
Mark Salyzyn
3df954fbf4
logcatd: trampoline persist.logd.logpersistd to logd.logpersistd
...
am: df5d12850a
-s ours
Change-Id: I1ebee9a5422c3a9248b222d988528b3aaa32b7c7
2016-07-22 04:08:29 +00:00
Android Build Merger (Role)
2d4492b088
Merge "logcatd: add stop and clear actions am: 2d737011d6
-s ours" into nyc-mr1-dev-plus-aosp
2016-07-22 03:58:57 +00:00
Mark Salyzyn
16efec00e8
logcatd: add stop and clear actions
...
am: 2d737011d6
-s ours
Change-Id: I43350a74c4477c369e11c493c8351ba220f5bcf1
2016-07-22 03:58:51 +00:00
Jorge Lucangeli Obes
701bc7b097
resolve merge conflicts of c6e22ba
to stage-aosp-master am: e629ced86a
...
am: 1aa9905aad
Change-Id: I91b22f0c1116cdf3c95b2c7370921d5052e5dda5
2016-07-22 03:58:45 +00:00
Jorge Lucangeli Obes
1aa9905aad
resolve merge conflicts of c6e22ba
to stage-aosp-master
...
am: e629ced86a
Change-Id: Ib3245257d16e2546c4c28d8fa2bef88e156a4090
2016-07-22 03:56:14 +00:00
Mark Salyzyn
fc429b9f4e
logcatd: Do not su for setprop
...
am: befa79d7e0
-s ours
Change-Id: Ifc580d984e3bfe57f8c659ca48b3a04645ab6f76
2016-07-22 03:49:54 +00:00
Mark Salyzyn
f593821aa7
logcat: allow comma-separate list of buffers
...
am: 7545b471a2
Change-Id: I801355c393d8b7577f35f127ea347dc8a301f8e0
2016-07-22 03:49:30 +00:00
Mark Salyzyn
1cf9842d48
logcat: clear when specifying file output
...
am: c869959d62
Change-Id: Ic7a13dff25875e75853bbabd8d0f4a889bedd868
2016-07-22 03:49:05 +00:00
Mark Salyzyn
838b180b6d
logcat: Adjust help to make it more meaningful
...
am: 3f6777a3dd
-s ours
Change-Id: I0e879150900862591fb32d741f036ca1810e7529
2016-07-22 03:21:22 +00:00
Jorge Lucangeli Obes
e629ced86a
resolve merge conflicts of c6e22ba
to stage-aosp-master
...
Change-Id: I65550ff841d27f985a3ab8618ecdf4a3500fb0be
2016-07-21 23:14:46 -04:00
Treehugger Robot
c6e22ba1a1
Merge "sdcard: Fix compilation with FUSE_TRACE == 1."
2016-07-22 01:07:20 +00:00
Mark Salyzyn
5283aa4bdd
Merge \\\"logcatd: logpersist.start to enable logd service if disabled\\\" am: eb9367f9d4
am: 5dbf514144
...
am: 2556106c4e
Change-Id: I236ddb26fbb24e5455c3b639d84add47d7dd1fba
2016-07-21 23:42:44 +00:00
Mark Salyzyn
2556106c4e
Merge \\"logcatd: logpersist.start to enable logd service if disabled\\" am: eb9367f9d4
...
am: 5dbf514144
Change-Id: Ib44942afa96d8640eaa3205ed20f0ed11f59fad2
2016-07-21 23:40:10 +00:00
Mark Salyzyn
5dbf514144
Merge \"logcatd: logpersist.start to enable logd service if disabled\"
...
am: eb9367f9d4
Change-Id: Iadf7a1484e7b2ed9752c610d2f05eadc79929a47
2016-07-21 23:37:12 +00:00
Treehugger Robot
eb9367f9d4
Merge "logcatd: logpersist.start to enable logd service if disabled"
2016-07-21 23:25:30 +00:00
Mark Salyzyn
6a7bfd8749
logcatd: logpersist.start to enable logd service if disabled
...
Bug: 28936216
Change-Id: I2f2878f138be6675bf00bd638df2bdd690a1fae5
2016-07-21 14:19:39 -07:00
Jorge Lucangeli Obes
714ec9d1de
sdcard: Fix compilation with FUSE_TRACE == 1.
...
"PRI{u,x}64" was not compiling on C++ because of macro expansions.
Implement DLOG the same way DCHECK is implemented in
<android-base/logging.h>, and mechanically replace the problematic
lines with C++ logging. Remaining TRACE() lines will be replaced in a
follow-up CL.
Bug: 30222003
Change-Id: I377a91722eb4c035093fc96b79438c4f638b9a45
2016-07-21 17:11:47 -04:00
Thierry Strudel
56efe020b7
Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
...
* changes:
logcatd: trampoline persist.logd.logpersistd to logd.logpersistd
logcatd: add stop and clear actions
logcatd: Do not su for setprop
logcat: allow comma-separate list of buffers
logcat: clear when specifying file output
logcat: Adjust help to make it more meaningful
2016-07-21 04:07:25 +00:00
Mark Salyzyn
505fb5a068
Merge \\\"logd: auditd: suppress multiple identical avc: messages to kmsg\\\" am: 02ccdc5db9
am: 8e7e71c56a
...
am: 7e0c62d33e
Change-Id: I00a32695272275e9b62c94f7aca4cb28b3e4913b
2016-07-20 20:43:07 +00:00
Mark Salyzyn
7e0c62d33e
Merge \\"logd: auditd: suppress multiple identical avc: messages to kmsg\\" am: 02ccdc5db9
...
am: 8e7e71c56a
Change-Id: I74df3891872d4313e35c9d804c5b6f1636cd053d
2016-07-20 20:40:38 +00:00
Mark Salyzyn
8e7e71c56a
Merge \"logd: auditd: suppress multiple identical avc: messages to kmsg\"
...
am: 02ccdc5db9
Change-Id: I65f93004d1795e025d99ca43aa9c45c39c1c2896
2016-07-20 20:37:41 +00:00
Treehugger Robot
02ccdc5db9
Merge "logd: auditd: suppress multiple identical avc: messages to kmsg"
2016-07-20 20:30:52 +00:00
Sergio Giro
8cb6b11176
Merge \\\"LruCache: avoid copying keys in lookup\\\" am: 896c6b14ae
am: 4476929073
...
am: d20120ae1f
Change-Id: I5e9e9966272d853e8ab56c763e9e6c8399e4b911
2016-07-20 19:53:40 +00:00
Sergio Giro
d20120ae1f
Merge \\"LruCache: avoid copying keys in lookup\\" am: 896c6b14ae
...
am: 4476929073
Change-Id: I3c49a22c68c8a66c912f08e3b7cdd8340de69532
2016-07-20 19:51:07 +00:00
Sergio Giro
4476929073
Merge \"LruCache: avoid copying keys in lookup\"
...
am: 896c6b14ae
Change-Id: If8223e90988510385378506cd3a05d382ab73fc9
2016-07-20 19:48:44 +00:00
Sergio Giro
896c6b14ae
Merge "LruCache: avoid copying keys in lookup"
2016-07-20 19:38:47 +00:00
Sergio Giro
4c56e0a222
LruCache: avoid copying keys in lookup
...
Create objects of type KeyedEntry for lookups that only have
a key reference
Bug: 27567036
Change-Id: I5e609a3db63d3b9277ff1547a3cca37dce70251c
2016-07-20 18:38:44 +00:00
Christopher Ferris
95043fb374
Merge \\\"Add ioprio values directly.\\\" am: feabb0fdc1
am: 93e00be7cc
...
am: 2e6ded2615
Change-Id: I63be2daefedb42f79fa04db65b63bddedda3fd25
2016-07-20 18:27:13 +00:00
Christopher Ferris
2e6ded2615
Merge \\"Add ioprio values directly.\\" am: feabb0fdc1
...
am: 93e00be7cc
Change-Id: If691edc8511ebf71babf0874d6c12a16b29b23e3
2016-07-20 18:18:29 +00:00
Christopher Ferris
93e00be7cc
Merge \"Add ioprio values directly.\"
...
am: feabb0fdc1
Change-Id: Ic8f7f714c30ef70172ebce8b6de7af8d09572eba
2016-07-20 18:10:55 +00:00
Christopher Ferris
feabb0fdc1
Merge "Add ioprio values directly."
2016-07-20 18:03:48 +00:00
Dan Willemsen
4f3a547d26
Merge \\\"Convert libpackagelistparser to Android.bp\\\" am: fdc396e277
am: 38feacd738
...
am: d0ec27ae1f
Change-Id: Ic43a54535435e4c3aee5fe9114ec10f1c43a2556
2016-07-20 15:32:31 +00:00
Dan Willemsen
d0ec27ae1f
Merge \\"Convert libpackagelistparser to Android.bp\\" am: fdc396e277
...
am: 38feacd738
Change-Id: Ifb2fe482f3802756d6fd1000fb376cd0a86ab02d
2016-07-20 15:29:31 +00:00
Dan Willemsen
38feacd738
Merge \"Convert libpackagelistparser to Android.bp\"
...
am: fdc396e277
Change-Id: I0639fdfb3604208cb5e893c31bd4aad7e346294d
2016-07-20 15:26:33 +00:00
Treehugger Robot
fdc396e277
Merge "Convert libpackagelistparser to Android.bp"
2016-07-20 15:21:42 +00:00
Jorge Lucangeli Obes
8871e70074
Merge \\\"logd: Use Minijail for privilege dropping.\\\" am: d3dfd95728
am: 8c345d1831
...
am: b3f2e36d72
Change-Id: I549fc6e80476b64960395074d1bc16efe133b623
2016-07-20 15:13:00 +00:00
Jorge Lucangeli Obes
b3f2e36d72
Merge \\"logd: Use Minijail for privilege dropping.\\" am: d3dfd95728
...
am: 8c345d1831
Change-Id: I6691d9c48d4fc8c1952ca6aad3278f9cbe8d40da
2016-07-20 15:10:31 +00:00
Jorge Lucangeli Obes
8c345d1831
Merge \"logd: Use Minijail for privilege dropping.\"
...
am: d3dfd95728
Change-Id: I4ee161fac939c57f273e4af669c3e845b81a4b45
2016-07-20 15:07:32 +00:00
Treehugger Robot
d3dfd95728
Merge "logd: Use Minijail for privilege dropping."
2016-07-20 15:02:17 +00:00
Dan Willemsen
74641844ed
Convert libpackagelistparser to Android.bp
...
Change-Id: If114efbbca5e5c31590e0f889cf773f94944dfb2
2016-07-19 22:19:37 -07:00
Jorge Lucangeli Obes
484c41f219
Merge \\\"sdcard: Use std::map.\\\" am: c15ab6e2c6
am: 0d039c4c44
...
am: c8a37397cc
Change-Id: If5aceb00fa756b4ea18cd844c296b74ca4fd211d
2016-07-20 02:17:13 +00:00
Jorge Lucangeli Obes
c8a37397cc
Merge \\"sdcard: Use std::map.\\" am: c15ab6e2c6
...
am: 0d039c4c44
Change-Id: I2b1daae1c466fdc50b15f3a0d6a39d15c70014e5
2016-07-20 02:14:16 +00:00
Jorge Lucangeli Obes
0d039c4c44
Merge \"sdcard: Use std::map.\"
...
am: c15ab6e2c6
Change-Id: Icacd305ffdf501ce6d7a6bbdd73d5f245575d804
2016-07-20 02:11:47 +00:00
Treehugger Robot
c15ab6e2c6
Merge "sdcard: Use std::map."
2016-07-20 02:04:00 +00:00
Pirama Arumuga Nainar
be0145765d
Merge \\\"Disable warnings triggered in Clang r271374\\\" am: fa1a21d085
am: 89cc8a57f4
...
am: 09dd6b7bee
Change-Id: I08944bd663d53b0a1cd4030a5035019aa693539e
2016-07-19 23:59:56 +00:00
Stephen Hines
09dd6b7bee
Merge \\"Disable warnings triggered in Clang r271374\\" am: fa1a21d085
...
am: 89cc8a57f4
Change-Id: Ibf67e2b6ca9cbeef3e3c97efbcdeaf7d97563e39
2016-07-19 23:52:24 +00:00
Pirama Arumuga Nainar
89cc8a57f4
Merge \"Disable warnings triggered in Clang r271374\"
...
am: fa1a21d085
Change-Id: I8ae8ec5436e7dc1173e463307ba0e925861156a0
2016-07-19 23:41:49 +00:00
Stephen Hines
fa1a21d085
Merge "Disable warnings triggered in Clang r271374"
2016-07-19 22:02:31 +00:00
Jorge Lucangeli Obes
d6d8faa690
sdcard: Use std::map.
...
Having CaseInsensitiveCompare use strcasecomp is not ideal, but other
solutions are not prettier.
Also, add a TODO to fix FUSE_TRACE, broken by the switch to C++.
Bug: 27147273
Change-Id: I0017c3a7d0254eb81abd128b97cd06c5ad0d1dff
2016-07-19 17:01:15 -04:00