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

Commit 8f7b11fd authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Support additional dynamically linked library in plugins" into udc-dev am: 2aa4ac32 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22906103



Change-Id: I53a11ec634dc2187cabfe212f9fb03e498d09706
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35b965fb 2aa4ac32

packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstance.java

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ public class PluginInstance<T extends Plugin> implements PluginLifecycleManager 


        private ClassLoader getParentClassLoader(ClassLoader baseClassLoader) {

            return new PluginManagerImpl.ClassLoaderFilter(

                    baseClassLoader, "com.android.systemui.plugin");

                    baseClassLoader, "com.android.systemui.log", "com.android.systemui.plugin");

        }



        /** Returns class loader specific for the given plugin. */

packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java

+9 −5
Original line number Diff line number Diff line
@@ -248,21 +248,25 @@ public class PluginManagerImpl extends BroadcastReceiver implements PluginManage 
    // This allows plugins to include any libraries or copied code they want by only including

    // classes from the plugin library.

    static class ClassLoaderFilter extends ClassLoader {

        private final String mPackage;

        private final String[] mPackages;

        private final ClassLoader mBase;



        public ClassLoaderFilter(ClassLoader base, String pkg) {

        ClassLoaderFilter(ClassLoader base, String... pkgs) {

            super(ClassLoader.getSystemClassLoader());

            mBase = base;

            mPackage = pkg;

            mPackages = pkgs;

        }



        @Override

        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {

            if (!name.startsWith(mPackage)) super.loadClass(name, resolve);

            for (String pkg : mPackages) {

                if (name.startsWith(pkg)) {

                    return mBase.loadClass(name);

                }

            }

            return super.loadClass(name, resolve);

        }

    }



    private class PluginExceptionHandler implements UncaughtExceptionHandler {