commit a9755cc1024935c20d8facbf8b2dc16c0ed84c82
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 09 13:03:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 09 13:03:55 2020 +0000
tree 2a188322c2173d850c81dcf0a77ea681277118b4
parent 4f812abe020a91484da67b476fb9540b02f923c7
parent fd1d3916dd0edec201858ede46d2227e23929d76

Merge "[GH] Fix issue caused by custom classloader." into androidx-master-dev

room/runtime/src/main/java/androidx/room/Room.java

diff --git a/room/runtime/src/main/java/androidx/room/Room.java b/room/runtime/src/main/java/androidx/room/Room.java
index cadf56c..6a570c4 100644
--- a/room/runtime/src/main/java/androidx/room/Room.java
+++ b/room/runtime/src/main/java/androidx/room/Room.java
@@ -85,9 +85,12 @@
         //noinspection TryWithIdenticalCatches
         try {
 
+            final String fullClassName = fullPackage.isEmpty()
+                    ? implName
+                    : fullPackage + "." + implName;
             @SuppressWarnings("unchecked")
             final Class<T> aClass = (Class<T>) Class.forName(
-                    fullPackage.isEmpty() ? implName : fullPackage + "." + implName);
+                    fullClassName, true, klass.getClassLoader());
             return aClass.newInstance();
         } catch (ClassNotFoundException e) {
             throw new RuntimeException("cannot find implementation for "