Tao Bao
88c264cfeb
Merge "healthd: Track the API change of res_create_multi_display_surface()." am: a2f1e65d13
...
am: 604622cb8c
* commit '604622cb8c417f054fc3721fe94052ca89aea046':
healthd: Track the API change of res_create_multi_display_surface().
2015-12-18 22:32:41 +00:00
Tao Bao
604622cb8c
Merge "healthd: Track the API change of res_create_multi_display_surface()."
...
am: a2f1e65d13
* commit 'a2f1e65d1309706928729e94119d248e25504a20':
healthd: Track the API change of res_create_multi_display_surface().
2015-12-18 22:30:32 +00:00
Tao Bao
a2f1e65d13
Merge "healthd: Track the API change of res_create_multi_display_surface()."
2015-12-18 22:20:32 +00:00
Jorge Lucangeli Obes
0b34dae6a4
Merge "Add audioserver UID." am: c57c622e76
...
am: 9369c5760f
* commit '9369c5760f41c1bb7e9ee273e1d5f361fceb4a44':
Add audioserver UID.
2015-12-18 22:18:32 +00:00
Jorge Lucangeli Obes
c3e0d1134e
Merge "New uid for extractor process" am: a3548a21ca
...
am: cda3bb5b93
-s ours
* commit 'cda3bb5b93e72f34df8e00c37544d0d632e1b192':
New uid for extractor process
2015-12-18 22:18:12 +00:00
Jorge Lucangeli Obes
9369c5760f
Merge "Add audioserver UID."
...
am: c57c622e76
* commit 'c57c622e7687ea82ab1de7581b27f068ebe3a9ad':
Add audioserver UID.
2015-12-18 22:03:47 +00:00
Jorge Lucangeli Obes
cda3bb5b93
Merge "New uid for extractor process"
...
am: a3548a21ca
* commit 'a3548a21caf7feabfbb0937904c9d2c6d9c5a901':
New uid for extractor process
2015-12-18 22:03:40 +00:00
Jorge Lucangeli Obes
c57c622e76
Merge "Add audioserver UID."
2015-12-18 22:00:59 +00:00
Jorge Lucangeli Obes
a3548a21ca
Merge "New uid for extractor process"
2015-12-18 22:00:17 +00:00
Mark Salyzyn
e813df74c9
Merge "logd: statistics per-pid filter" am: f2e88777fb
...
am: e39a969808
* commit 'e39a9698084baecb409d1619d035eba14cb5f2af':
logd: statistics per-pid filter
2015-12-18 21:41:32 +00:00
Mark Salyzyn
e39a969808
Merge "logd: statistics per-pid filter"
...
am: f2e88777fb
* commit 'f2e88777fb7d82dc788dc3a5f6b6b3b8e84c2139':
logd: statistics per-pid filter
2015-12-18 21:38:38 +00:00
Mark Salyzyn
f2e88777fb
Merge "logd: statistics per-pid filter"
2015-12-18 21:26:16 +00:00
Mark Salyzyn
ee3b838e13
logd: statistics per-pid filter
...
Primarily gives access to the Chattiest TIDs and TAGs
associated with a pid.
Has a secondary effect of allowing us to pull out the
command line, comm and in some cases the associated
PACKAGE for a specific pid while the logs are still
present even if the executable is gone.
Bug: 26029733
Bug: 21615139
Change-Id: I1ea63165a680a9318360579b70b1512078ed5682
2015-12-18 13:17:37 -08:00
Jorge Lucangeli Obes
37211e1f3d
Add audioserver UID.
...
(Originally in
https://googleplex-android-review.git.corp.google.com/#/c/804752 ).
Change-Id: I31951cad1bbcec58b21559be0d86581ba9187a92
2015-12-18 13:06:34 -08:00
Mark Salyzyn
e687c517b1
Merge "liblog: test: pmsg overhead measurement" am: 5d8742feb6
...
am: 3a413211f1
* commit '3a413211f15c59804c65b8c841f365e50c132ac1':
liblog: test: pmsg overhead measurement
2015-12-18 21:06:03 +00:00
Mark Salyzyn
dd659520ce
Merge "liblog: Remove paranoia regarding logd" am: 1d51753461
...
am: e1341c6910
* commit 'e1341c69104bb9e9bc0ad01ce5481a7bc27c159e':
liblog: Remove paranoia regarding logd
2015-12-18 21:05:57 +00:00
Colin Cross
20cf81a2ec
Merge "Turn off CRC checking for append2simg" am: 9df73b007a
...
am: 4db7607987
* commit '4db7607987fa4e279a05c3d271f7003b96cf4abd':
Turn off CRC checking for append2simg
2015-12-18 21:05:52 +00:00
Mark Salyzyn
b098418872
Merge "logcat: test: rotated logs can exceed size during crash" am: 55c636a29f
...
am: 0b57d1efcc
* commit '0b57d1efcc1d3e584297078d23e10cd1f4676167':
logcat: test: rotated logs can exceed size during crash
2015-12-18 21:05:46 +00:00
Mark Salyzyn
964cc66e45
Merge "logd: test drop __unused" am: fb9ff0e8ad
...
am: 0f33cfab28
* commit '0f33cfab285d815c148986b7188ca24158de6d01':
logd: test drop __unused
2015-12-18 21:05:40 +00:00
Mark Salyzyn
3a413211f1
Merge "liblog: test: pmsg overhead measurement"
...
am: 5d8742feb6
* commit '5d8742feb66b8dc8aee0c8ce4fc2f5617f3e7f8b':
liblog: test: pmsg overhead measurement
2015-12-18 20:40:56 +00:00
Mark Salyzyn
e1341c6910
Merge "liblog: Remove paranoia regarding logd"
...
am: 1d51753461
* commit '1d517534612d8eba31c6781aa9078999e8a05945':
liblog: Remove paranoia regarding logd
2015-12-18 20:40:49 +00:00
Colin Cross
4db7607987
Merge "Turn off CRC checking for append2simg"
...
am: 9df73b007a
* commit '9df73b007a2751223ea3ba8287c40c55b4e576a5':
Turn off CRC checking for append2simg
2015-12-18 20:40:43 +00:00
Mark Salyzyn
0b57d1efcc
Merge "logcat: test: rotated logs can exceed size during crash"
...
am: 55c636a29f
* commit '55c636a29f87049af75bb8198d031ae9fb7039e5':
logcat: test: rotated logs can exceed size during crash
2015-12-18 20:40:38 +00:00
Mark Salyzyn
0f33cfab28
Merge "logd: test drop __unused"
...
am: fb9ff0e8ad
* commit 'fb9ff0e8ade1fca7260a18686d7b02eb912bba36':
logd: test drop __unused
2015-12-18 20:40:31 +00:00
Mark Salyzyn
5d8742feb6
Merge "liblog: test: pmsg overhead measurement"
2015-12-18 20:34:55 +00:00
Tim Murray
5ecd7689d2
resolve merge conflicts of e9cf477488
to mnc-dr2-dev-plus-aosp.
...
am: 430a5d3b43
* commit '430a5d3b43cc30eb9ef01b57387b24173c8c35a4':
Fix logspam from system-background cpuset.
2015-12-18 20:05:41 +00:00
Tim Murray
430a5d3b43
resolve merge conflicts of e9cf477488
to mnc-dr2-dev-plus-aosp.
...
Change-Id: I162578bdbb831c0442df03cee142dbc9df657799
2015-12-18 11:27:33 -08:00
Marco Nelissen
51544cc778
New uid for extractor process
...
Change-Id: I462d4736e772da0a08b4793fc1b971ff261667ea
2015-12-18 11:11:17 -08:00
Tim Murray
e9cf477488
resolve merge conflicts of 14b307fa47
to mnc-dr2-dev.
...
Change-Id: I82f17b717b509553389185e6bc9886c105fcd59d
2015-12-18 10:55:00 -08:00
Mark Salyzyn
1d51753461
Merge "liblog: Remove paranoia regarding logd"
2015-12-18 18:51:24 +00:00
Colin Cross
9df73b007a
Merge "Turn off CRC checking for append2simg"
2015-12-18 18:47:30 +00:00
Mark Salyzyn
75594b4f13
Merge "logd: ro.config.low_ram set buffer size to 64K" am: 236fecd923
...
am: 6773967938
* commit '6773967938c3936cf9545071f277193d4c60b3d2':
logd: ro.config.low_ram set buffer size to 64K
2015-12-18 18:41:08 +00:00
Elliott Hughes
f6e7622aea
Merge "adb host: add device state in "adb wait-for-*"" am: 82509e7925
...
am: ba7a198c29
* commit 'ba7a198c2976baf9574dd01d7719ec0443caba47':
adb host: add device state in "adb wait-for-*"
2015-12-18 18:40:17 +00:00
Josh Gao
3f165e8d5b
Merge "adb: extract USB FFS read/write limit constants." am: 1ff73936a7
...
am: 67a6d861ce
* commit '67a6d861ce47b2d555a0e6d4288f3c3d35a9155b':
adb: extract USB FFS read/write limit constants.
2015-12-18 18:39:54 +00:00
Elliott Hughes
c85c7e84cc
Merge "Improve "adb install"\'s error message slightly." am: d361582dc0
...
am: 79abeb68f2
* commit '79abeb68f26c3ff9b99929fe15b25fd202225ffc':
Improve "adb install"'s error message slightly.
2015-12-18 18:39:33 +00:00
Mark Salyzyn
55c636a29f
Merge "logcat: test: rotated logs can exceed size during crash"
2015-12-18 18:37:33 +00:00
Mark Salyzyn
fb9ff0e8ad
Merge "logd: test drop __unused"
2015-12-18 18:36:47 +00:00
Mark Salyzyn
8beb0d3ad7
logcat: test: rotated logs can exceed size during crash
...
Some crash messages can be as large as 4K, so allow
the rotated logs to have a larger size.
Change-Id: I20ef8d526ad2d5eca128d1f99f4ea2d2da426403
2015-12-18 10:35:20 -08:00
Mark Salyzyn
7b4a2049b0
logd: test drop __unused
...
Change-Id: I1ccf49809b8a0a125601bdb52834c463e2d94165
2015-12-18 10:35:00 -08:00
Jorge Lucangeli Obes
135405fd20
Merge "adb: Use Minijail for privilege dropping." am: 297a8381b5
...
am: f733d6acad
* commit 'f733d6acad6582fb7d816ef65bbeecfd745af5ec':
adb: Use Minijail for privilege dropping.
2015-12-18 01:52:10 +00:00
Tom Cherry
065c723db2
Merge "Use selinux_android_setcon() instead of setcon()" am: 64cc0825a6
...
am: 4692984e92
* commit '4692984e92de83299f4c03ec176c9a4b4dcb0292':
Use selinux_android_setcon() instead of setcon()
2015-12-18 01:48:52 +00:00
Colin Cross
b5619d9630
Turn off CRC checking for append2simg
...
make_ext4fs doesn't write out a CRC chunk, and append2simg doesn't
either, but append2simg was still performing a CRC on every input
block. Cuts append2simg time in half.
Change-Id: I678f807abbb741042461ed68a0f61b406d3665fb
2015-12-17 17:28:44 -08:00
Mark Salyzyn
6773967938
Merge "logd: ro.config.low_ram set buffer size to 64K"
...
am: 236fecd923
* commit '236fecd92352217e8a3272751b44c1e5a23ad1b2':
logd: ro.config.low_ram set buffer size to 64K
2015-12-17 23:54:40 +00:00
Mark Salyzyn
236fecd923
Merge "logd: ro.config.low_ram set buffer size to 64K"
2015-12-17 23:47:14 +00:00
Elliott Hughes
ba7a198c29
Merge "adb host: add device state in "adb wait-for-*""
...
am: 82509e7925
* commit '82509e79253309af7d78ebc833ca922b7f7b3c48':
adb host: add device state in "adb wait-for-*"
2015-12-17 22:50:16 +00:00
Elliott Hughes
82509e7925
Merge "adb host: add device state in "adb wait-for-*""
2015-12-17 22:44:15 +00:00
Josh Gao
67a6d861ce
Merge "adb: extract USB FFS read/write limit constants."
...
am: 1ff73936a7
* commit '1ff73936a77df18395b347bd9245308141269e36':
adb: extract USB FFS read/write limit constants.
2015-12-17 14:34:57 -08:00
Josh Gao
1ff73936a7
Merge "adb: extract USB FFS read/write limit constants."
2015-12-17 22:29:12 +00:00
Josh Gao
ae72b5aa4b
adb: extract USB FFS read/write limit constants.
...
Change-Id: I5e9fb7959a1c4744cb8d53ece4634138239d4e49
2015-12-17 14:28:24 -08:00
Elliott Hughes
79abeb68f2
Merge "Improve "adb install"\'s error message slightly."
...
am: d361582dc0
* commit 'd361582dc04063ca93d9939d0315373b10b9200f':
Improve "adb install"'s error message slightly.
2015-12-17 22:22:33 +00:00