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

Commit 13f50b98 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Changes to the signature of PluginManagerImpl. 

Bug: 194781951
Test: manual
Change-Id: Iafc5232dfdb1cc1c554de925c2f0d2ad5f6439e2
parent 0a39f6da

quickstep/src/com/android/launcher3/uioverrides/plugins/PluginInitializerImpl.java

+1 −18
Original line number Diff line number Diff line
@@ -14,34 +14,17 @@ 


package com.android.launcher3.uioverrides.plugins;



import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;



import android.content.Context;

import android.os.Looper;



import com.android.launcher3.Utilities;

import com.android.systemui.shared.plugins.PluginInitializer;



public class PluginInitializerImpl implements PluginInitializer {

    @Override

    public Looper getBgLooper() {

        return MODEL_EXECUTOR.getLooper();

    }



    @Override

    public void onPluginManagerInit() {

    }



    @Override

    public String[] getWhitelistedPlugins(Context context) {

    public String[] getPrivilegedPlugins(Context context) {

        return new String[0];

    }



    @Override

    public PluginEnablerImpl getPluginEnabler(Context context) {

        return new PluginEnablerImpl(context);

    }



    @Override

    public void handleWtfs() {

    }

quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java

+12 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ package com.android.launcher3.uioverrides.plugins; 


import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;



import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;



import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -24,6 +26,7 @@ import android.content.pm.ResolveInfo; 
import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.systemui.plugins.Plugin;

import com.android.systemui.plugins.PluginListener;

import com.android.systemui.shared.plugins.PluginInstanceManager;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.shared.plugins.PluginManagerImpl;

import com.android.systemui.shared.plugins.PluginPrefs;
@@ -31,6 +34,7 @@ import com.android.systemui.shared.plugins.PluginPrefs; 
import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.Optional;

import java.util.Set;



public class PluginManagerWrapper {
@@ -47,8 +51,14 @@ public class PluginManagerWrapper { 
    private PluginManagerWrapper(Context c) {

        mContext = c;

        PluginInitializerImpl pluginInitializer  = new PluginInitializerImpl();

        mPluginManager = new PluginManagerImpl(c, pluginInitializer);

        mPluginEnabler = pluginInitializer.getPluginEnabler(c);

        mPluginEnabler = new PluginEnablerImpl(c);

        PluginInstanceManager.Factory instanceManagerFactory = new PluginInstanceManager.Factory(

                c, c.getPackageManager(),  MODEL_EXECUTOR.getLooper(), pluginInitializer);



        mPluginManager = new PluginManagerImpl(c, instanceManagerFactory,

                pluginInitializer.isDebuggable(),

                Optional.ofNullable(Thread.getDefaultUncaughtExceptionHandler()), mPluginEnabler,

                new PluginPrefs(c), pluginInitializer.getPrivilegedPlugins(c));

    }



    public PluginEnablerImpl getPluginEnabler() {