Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 811e7635 authored by Justin Weir's avatar Justin Weir
Browse files

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
parent eba6a95a
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -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);
    }