commit 59fda04bfde7411ef949fb9924a32f36d025a941
author Chia-I Wu <olv@google.com> Tue Jul 03 21:36:38 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 03 21:36:38 2018 +0000
tree 6259031d7b63a433fdf6eb052ad9cd6624610eed
parent 8cbb40151c4657751c0da261c52abcea22d359ba
parent 197dc1fd3cfe3d4b22280be241bfe1a85b8d37e6

Merge changes from topic "boot-splash" into pi-dev

* changes:
  surfaceflinger: default to DisplayColorSetting::ENHANCED
  surfaceflinger: signalRefresh after boot animation starts

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index fe9dd56..31e73fb 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -200,7 +200,7 @@
         { REQ,      "events/vmscan/mm_vmscan_direct_reclaim_end/enable" },
         { REQ,      "events/vmscan/mm_vmscan_kswapd_wake/enable" },
         { REQ,      "events/vmscan/mm_vmscan_kswapd_sleep/enable" },
-        { REQ,      "events/lowmemorykiller/enable" },
+        { OPT,      "events/lowmemorykiller/enable" },
     } },
     { "regulators",  "Voltage and Current Regulators", 0, {
         { REQ,      "events/regulator/enable" },