From 5fe631dd55a0e5459437e80d8b032ea5dacdd919 Mon Sep 17 00:00:00 2001 From: Kalesh Singh Date: Tue, 2 Jul 2019 13:51:53 -0700 Subject: [PATCH] Add SystemSuspend HAL to ANR list. Makes SystemSuspend native stack traces available in ANR dumps and adb bugreport. Bug: 135458700 Test: adb shell am hang; check /data/anr/ for android.system.suspend stack traces. Test: adb shell am hang, adb bugreport, grep through bug report for suspend stack traces. (grep -rn "Cmd line: /system/bin/hw/android.system.suspend@1.0-service") Test: Confirmed that deadlock on suspend/resume path triggers ANR dump. Simulated deadlock by adding sleep to suspend thread. Unplug the device lock the screen and wait for suspend to trigger. Check anr dump and bugreport for stack traces. Test: Confirmed traces are also available on user builds via adb bugreport. (adb bugreport pulls data from ANR dump files). Change-Id: Icfc67c544e8d3fe3ef59ac12801c1a82c5545935 Merged-In: Id274afd4e3fbe2288ef6d5f6566c2601b8fc0a50 --- services/core/java/com/android/server/Watchdog.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java index 5b9c78f6e8ea3..19ad32e202fe1 100644 --- a/services/core/java/com/android/server/Watchdog.java +++ b/services/core/java/com/android/server/Watchdog.java @@ -114,7 +114,8 @@ public class Watchdog extends Thread { "android.hardware.media.omx@1.0::IOmxStore", "android.hardware.power.stats@1.0::IPowerStats", "android.hardware.sensors@1.0::ISensors", - "android.hardware.vr@1.0::IVr" + "android.hardware.vr@1.0::IVr", + "android.system.suspend@1.0::ISystemSuspend" ); static Watchdog sWatchdog;