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

Commit 916c7114 authored by Calin Juravle's avatar Calin Juravle Committed by Andreas Gampe
Browse files

Add DexClassLoader to the list of supported class loaders 

DexClassLoader have the same behavior as PathClassLoader and is still in
use by apps. Add it to the list of supported class loaders so that it can be
recognized during secondary dex file loads.

(cherry picked from commit f8c14e92)

Bug: 38138251
Bug: 36044779

Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java

(cherry picked from commit d08b3156)

Merged-In: If02081d29f4d8ac917dacd877eb75985ea3895a9
Change-Id: If02081d29f4d8ac917dacd877eb75985ea3895a9
parent c1fe2ce8

services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.support.test.runner.AndroidJUnit4; 
import android.util.SparseArray;

import android.util.SparseArray;





import dalvik.system.DelegateLastClassLoader;

import dalvik.system.DelegateLastClassLoader;

import dalvik.system.DexClassLoader;

import dalvik.system.PathClassLoader;

import dalvik.system.PathClassLoader;





import org.junit.Test;

import org.junit.Test;
@@ -32,6 +33,7 @@ import org.junit.runner.RunWith; 
@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

@SmallTest

@SmallTest

public class DexoptUtilsTest {

public class DexoptUtilsTest {

    private static final String DEX_CLASS_LOADER_NAME = DexClassLoader.class.getName();

    private static final String PATH_CLASS_LOADER_NAME = PathClassLoader.class.getName();

    private static final String PATH_CLASS_LOADER_NAME = PathClassLoader.class.getName();

    private static final String DELEGATE_LAST_CLASS_LOADER_NAME =

    private static final String DELEGATE_LAST_CLASS_LOADER_NAME =

            DelegateLastClassLoader.class.getName();

            DelegateLastClassLoader.class.getName();