summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2017-07-24 17:56:51 -0700
committer Andreas Gampe <agampe@google.com> 2017-11-01 13:07:34 -0700
commit916c7114ae72ae98a2039ac290d9c23b1067f51a (patch)
treea3b9bad0b276992b8fdb2a3ed14467fa32163953
parentc1fe2ce8493b0750aaa210531fda0766b73bad16 (diff)
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 f8c14e920ea2911ab7657de9bc3e0a834cd7e8b9) Bug: 38138251 Bug: 36044779 Test: runtest -x services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java (cherry picked from commit d08b3156e8e908bae63dfd8f47c8e6f7ba98967f) Merged-In: If02081d29f4d8ac917dacd877eb75985ea3895a9 Change-Id: If02081d29f4d8ac917dacd877eb75985ea3895a9
-rw-r--r--services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java b/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
index 21b286e68adf..c3d6a531dfc8 100644
--- a/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
@@ -24,6 +24,7 @@ import android.support.test.runner.AndroidJUnit4;
import android.util.SparseArray;
import dalvik.system.DelegateLastClassLoader;
+import dalvik.system.DexClassLoader;
import dalvik.system.PathClassLoader;
import org.junit.Test;
@@ -32,6 +33,7 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
@SmallTest
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 DELEGATE_LAST_CLASS_LOADER_NAME =
DelegateLastClassLoader.class.getName();