a53ec324bd
DO NOT MERGE: add support for new sched tracepoint
...
This tracepoint gives systrace the means to display the reason
for uninterruptible sleep.
bug 23350688
Change-Id: Iaf9c929fe1169f8872a7f8135343950aa322b0f5
2015-11-30 10:58:26 -08:00
6eee56ccab
Improve cpuset support for surfaceflinger.
...
SurfaceFlinger needs some of its threads in the system-background cpuset
and some of its threads (the binder pool) outside of the
system-background cpuset in order to improve UI perf/power
consumption. Remove surfaceflinger from the system-background cpuset in
init.rc and allow a thread to place itself in the system-background
cpuset given enough permissions.
bug 25745866
Change-Id: I85f7e41c5439e6ad7cc2d355e51f5dfb3a0c7088
2015-11-18 22:36:23 +00:00
1589fa1bda
logcat: continue where we left off
...
am: 5b0d59dde8
2015-11-12 23:44:18 +00:00
5b0d59dde8
logcat: continue where we left off
...
Issue introduced as part of new logcatd functionality in
commit f3555d9427
2015-11-12 11:51:41 -08:00
7b5fa175fa
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7 am: 088639a20f -s ours am: 55263d2ae3
...
am: 99cd21ef5c
2015-11-11 20:52:49 +00:00
ae1f2bfe92
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours am: 2f1562eb10
...
am: 9f1b1caa78
2015-11-11 20:52:44 +00:00
ec73aeaaab
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours am: a1da204980
...
am: 7755770ac9
2015-11-11 20:52:38 +00:00
99cd21ef5c
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7 am: 088639a20f -s ours
...
am: 55263d2ae3
2015-11-11 20:45:04 +00:00
9f1b1caa78
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours
...
am: 2f1562eb10
2015-11-11 20:44:57 +00:00
7755770ac9
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours
...
am: a1da204980
2015-11-11 20:44:50 +00:00
55263d2ae3
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7
...
am: 088639a20f
2015-11-11 20:41:08 +00:00
2f1562eb10
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb
...
am: 089ad5e98a
2015-11-11 20:41:02 +00:00
a1da204980
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours
...
am: d0ed7943b8
2015-11-11 20:40:55 +00:00
088639a20f
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours
...
am: ea1e6a59e7
2015-11-11 20:37:57 +00:00
089ad5e98a
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours
...
am: 93a3871abb
2015-11-11 20:37:51 +00:00
d0ed7943b8
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev
...
am: f84eef3fca
2015-11-11 20:37:43 +00:00
ea1e6a59e7
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a
...
am: 702fe6d486
2015-11-11 14:02:59 +00:00
702fe6d486
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours
...
am: 362f13d74a
2015-11-11 13:59:19 +00:00
5c3c0236c3
Merge "Add macro to call event logger for errors." into mnc-dev am: d028c6fa7f
...
am: bc1ef58505
2015-11-11 13:55:57 +00:00
362f13d74a
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158
...
am: fd56dc41c7
2015-11-11 13:55:57 +00:00
fd56dc41c7
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev
...
am: 809d5a0158
2015-11-11 13:50:40 +00:00
93a3871abb
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56
...
am: 442a830e9b
2015-11-11 13:50:39 +00:00
bc1ef58505
Merge "Add macro to call event logger for errors." into mnc-dev
...
am: d028c6fa7f
2015-11-11 13:46:21 +00:00
442a830e9b
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev
...
am: 5280061b56
2015-11-11 13:46:21 +00:00
d028c6fa7f
Merge "Add macro to call event logger for errors." into mnc-dev
2015-11-11 13:42:38 +00:00
f84eef3fca
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev
2015-11-11 13:42:37 +00:00
5280061b56
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev
2015-11-11 13:42:35 +00:00
809d5a0158
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev
2015-11-11 13:42:33 +00:00
f6891c025a
Add macro to call event logger for errors.
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:34:08 +00:00
9a86c283cd
Add macro to call event logger for errors. DO NOT MERGE
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:46 +00:00
f34258fa9b
Add macro to call event logger for errors. DO NOT MERGE
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:32 +00:00
4fd82100cc
Add macro to call event logger for errors. DO NOT MERGE
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:10 +00:00
1208d25b18
Merge "logd: pruning time horizon" into mnc-dr-dev
...
am: dfbe85ec8b
2015-11-04 18:41:13 +00:00
dfbe85ec8b
Merge "logd: pruning time horizon" into mnc-dr-dev
2015-11-04 18:27:25 +00:00
653316adf1
logd: pruning time horizon
...
Estimate a time horizon of ten fold for worst UID pruning
Bug: 25453210
Bug: 24782000
Change-Id: I7118deb6d42531c68ed2ac2a59c57b0580b942cc
2015-11-03 16:26:06 -08:00
88ae7e3721
Remove __DATE__/__TIME__ from init and debuggerd
...
am: 36b24a4a20
2015-11-03 19:39:33 +00:00
36b24a4a20
Remove __DATE__/__TIME__ from init and debuggerd
...
Keeping these means that every build has different init and debuggerd
binaries, even if the source was the same. So OTAs that don't touch
these sources would still need to update the binaries.
Both of these messages are only informational, so can be safely removed.
Bootchart already encodes build-specific information from the system
properties.
Bug: 24204119
Change-Id: I7ebd65a20a3e031e7528c9f741616e20b3cd7446
(cherry picked from commit 30622bbb20
2015-10-30 14:51:29 -07:00
3f5fdc3522
Fix incorrect check of descsz value. am: d917514bd6
...
am: 69406d904a
2015-10-29 19:20:52 +00:00
69406d904a
Fix incorrect check of descsz value.
...
am: d917514bd6
2015-10-29 19:12:37 +00:00
d917514bd6
Fix incorrect check of descsz value.
...
Bug: 25187394
(cherry picked from commit 1fa55234d6
2015-10-22 17:54:24 -07:00
ba1d268273
Merge "Don\'t show UI on default encryption" into mnc-dr-dev
...
am: 2b216aa89b
2015-10-21 14:58:50 +00:00
2b216aa89b
Merge "Don't show UI on default encryption" into mnc-dr-dev
2015-10-21 14:27:38 +00:00
e56b566401
Reorder init.rc to avoid a kernel warning.
...
am: f429d37807
2015-10-20 22:08:36 +00:00
f429d37807
Reorder init.rc to avoid a kernel warning.
...
3.18 has a warning in dmesg that appears when the parent cpuset's cpus
and mems are changed to something other than what the child has. Reorder
init.rc to prevent this warning from appearing.
bug 24941443
Change-Id: I49d8394063b23dce03222dcc9ddccdc32bb97ea2
2015-10-15 12:38:15 -07:00
43ed8e1522
am 08cf0e55: Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev
...
* commit '08cf0e55a7c7e968d5f500d1ba01b9665077f0d4':
healthd: Adds fake battery properties for devices with no battery.
2015-10-12 21:53:10 +00:00
08cf0e55a7
Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev
2015-10-12 21:40:39 +00:00
42a981ddee
healthd: Adds fake battery properties for devices with no battery.
...
Devices which have no battery and are always plugged in will not have
any battery property initialized. This causes the 'stable power' to
never be switched which is required for updating apps.
This change recognizes such a device and manually sets the battery to
100% and charger status to connected to AC mains. It will also fake the
battery temperature.
Bug: 24258855
Change-Id: I98e5ed0dbeb7f2ab6d3802cd7e0f3a269bd8f31f
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2015-10-12 14:31:58 -07:00
e2d2c1cb30
am 4ae302af: fs_mgr: trigger dm-verity error handling for invalid signatures
...
* commit '4ae302af7d0f72559ffb8dd521f290b02fed3072':
fs_mgr: trigger dm-verity error handling for invalid signatures
2015-09-24 09:51:02 +00:00
4ae302af7d
fs_mgr: trigger dm-verity error handling for invalid signatures
...
Currently, the device doesn't mount verified partitions if the
verity table signature is invalid, which usually means it fails to
boot. This change instead sets up dm-verity with an invalid root
hash and triggers device-specific error handling to recover from
the corruption.
Bug: 24256506
Change-Id: I6d693306fa0e7459c5500b028e433df61ecea6fb
(cherry picked from commit 47caa5c386
2015-09-22 08:09:37 +00:00
5caca3dd89
am a3f45684: Merge "add system-background cpuset" into mnc-dr-dev
...
* commit 'a3f45684bda7b3a479e480ccb90cc745f8852efd':
add system-background cpuset
2015-09-21 20:00:56 +00:00
Tim Murray