Merge "Dump stacktrace of native process when timeout." into qt-dev (fc7f4522) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/SystemServerInitThreadPool.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ public class SystemServerInitThreadPool {
		private static void dumpStackTraces() {
		final ArrayList<Integer> pids = new ArrayList<>();
		pids.add(Process.myPid());
		ActivityManagerService.dumpStackTraces(
		pids, null, null, null);
		ActivityManagerService.dumpStackTraces(pids, null, null,
		Watchdog.getInterestingNativePids());
		}
		}

+14 −13

Original line number	Diff line number	Diff line
		@@ -111,7 +111,8 @@ public class Watchdog extends Thread {
		"android.hardware.media.omx@1.0::IOmx",
		"android.hardware.media.omx@1.0::IOmxStore",
		"android.hardware.sensors@1.0::ISensors",
		"android.hardware.vr@1.0::IVr"
		"android.hardware.vr@1.0::IVr",
		"android.hardware.biometrics.face@1.0::IBiometricsFace"
		);

		static Watchdog sWatchdog;
		@@ -396,7 +397,7 @@ public class Watchdog extends Thread {
		return builder.toString();
		}

		private ArrayList<Integer> getInterestingHalPids() {
		private static ArrayList<Integer> getInterestingHalPids() {
		try {
		IServiceManager serviceManager = IServiceManager.getService();
		ArrayList<IServiceManager.InstanceDebugInfo> dump =
		@@ -419,7 +420,7 @@ public class Watchdog extends Thread {
		}
		}

		private ArrayList<Integer> getInterestingNativePids() {
		static ArrayList<Integer> getInterestingNativePids() {
		ArrayList<Integer> pids = getInterestingHalPids();

		int[] nativePids = Process.getPidsForCommands(NATIVE_STACKS_OF_INTEREST);