From 811e76353aada3b8271832e20852f0243024e0eb Mon Sep 17 00:00:00 2001 From: Justin Weir Date: Mon, 2 May 2022 15:28:44 -0400 Subject: [PATCH] Ensure log buffers are dumped to file on uncaught exceptions Update PluginManagerWrapper according to changes in ag/17915248 Bug: 213884413 Test: manually verified, added tests, and ran atest Change-Id: If829fc33769819624530f766178689ecf0374926 --- .../uioverrides/plugins/PluginManagerWrapper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java index df0ac7ce22..fe0bca6646 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java +++ b/quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java @@ -33,12 +33,12 @@ import com.android.systemui.shared.plugins.PluginInstance; import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.shared.plugins.PluginManagerImpl; import com.android.systemui.shared.plugins.PluginPrefs; +import com.android.systemui.shared.system.UncaughtExceptionPreHandlerManager; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.Set; public class PluginManagerWrapper { @@ -48,6 +48,9 @@ public class PluginManagerWrapper { public static final String PLUGIN_CHANGED = PluginManager.PLUGIN_CHANGED; + private static final UncaughtExceptionPreHandlerManager UNCAUGHT_EXCEPTION_PRE_HANDLER_MANAGER = + new UncaughtExceptionPreHandlerManager(); + private final Context mContext; private final PluginManager mPluginManager; private final PluginEnablerImpl mPluginEnabler; @@ -67,7 +70,7 @@ public class PluginManagerWrapper { mPluginManager = new PluginManagerImpl(c, instanceManagerFactory, Utilities.IS_DEBUG_DEVICE, - Optional.ofNullable(Thread.getDefaultUncaughtExceptionHandler()), mPluginEnabler, + UNCAUGHT_EXCEPTION_PRE_HANDLER_MANAGER, mPluginEnabler, new PluginPrefs(c), privilegedPlugins); }