Patch LittleMock for change in internal methodsandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-l-preview_r2android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2l-previewkitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devidea133-weekly-releaseidea133

Bug: 8297640
Change-Id: I0a18ec915ec69170e8a4cfc80a211fd07be9df00

3 files changed, 35 insertions, 1 deletions

diff --git a/README b/README
index 86b8be6..847dac9 100644
--- a/README
+++ b/README
@@ -14,4 +14,5 @@ Can mock concrete classes, requires dexmaker.jar on classpath.
 Local Modifications:
 - Change to AppDataDirGuesser to handle the new class loader toString
   format introduced in JB.
-
+- bug8297640.patch: update instantiation code to handle change in internal
+  methods
diff --git a/bug-8297640.patch b/bug-8297640.patch
new file mode 100644
index 0000000..24f2c69
--- /dev/null
+++ b/bug-8297640.patch
@@ -0,0 +1,22 @@
+Index: src/com/google/testing/littlemock/LittleMock.java
+===================================================================
+--- src/com/google/testing/littlemock/LittleMock.java	(revision 19)
++++ src/com/google/testing/littlemock/LittleMock.java	(working copy)
+@@ -1268,6 +1268,17 @@
+       newInstance.setAccessible(true);
+       return (T) newInstance.invoke(null, clazz, constructorId);
+     } catch (Exception ignored) {}
++    // try dalvikvm, with change https://android-review.googlesource.com/#/c/52331/
++    try {
++      Method getConstructorId = ObjectStreamClass.class
++          .getDeclaredMethod("getConstructorId", Class.class);
++      getConstructorId.setAccessible(true);
++      final long constructorId = (Long) getConstructorId.invoke(null, Object.class);
++      final Method newInstance = ObjectStreamClass.class
++          .getDeclaredMethod("newInstance", Class.class, long.class);
++      newInstance.setAccessible(true);
++      return (T) newInstance.invoke(null, clazz, constructorId);
++    } catch (Exception ignored) {}
+     throw new IllegalStateException("unsafe create instance failed");
+   }
+ 
diff --git a/src/com/google/testing/littlemock/LittleMock.java b/src/com/google/testing/littlemock/LittleMock.java
index 140f853..0e96938 100644
--- a/src/com/google/testing/littlemock/LittleMock.java
+++ b/src/com/google/testing/littlemock/LittleMock.java
@@ -1314,6 +1314,17 @@ public class LittleMock {
       newInstance.setAccessible(true);
       return (T) newInstance.invoke(null, clazz, constructorId);
     } catch (Exception ignored) {}
+    // try dalvikvm, with change https://android-review.googlesource.com/#/c/52331/
+    try {
+      Method getConstructorId = ObjectStreamClass.class
+          .getDeclaredMethod("getConstructorId", Class.class);
+      getConstructorId.setAccessible(true);
+      final long constructorId = (Long) getConstructorId.invoke(null, Object.class);
+      final Method newInstance = ObjectStreamClass.class
+          .getDeclaredMethod("newInstance", Class.class, long.class);
+      newInstance.setAccessible(true);
+      return (T) newInstance.invoke(null, clazz, constructorId);
+    } catch (Exception ignored) {}
     throw new IllegalStateException("unsafe create instance failed");
   }