Merge "Adapt to new signatures for running character advance for Paint." into main

2 files changed, 45 insertions, 42 deletions

diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePaint.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePaint.java
index 476477679..34cb9ebd9 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePaint.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePaint.java
@@ -868,30 +868,32 @@ public class ShadowNativePaint {
         advancesIndex);
   }
 
+  /** Requires loose signatures because of RunInfo parameter */
   @Implementation(minSdk = V.SDK_INT)
   protected static float nGetRunCharacterAdvance(
-      long paintPtr,
-      char[] text,
-      int start,
-      int end,
-      int contextStart,
-      int contextEnd,
-      boolean isRtl,
-      int offset,
-      float[] advances,
-      int advancesIndex,
-      RectF drawingBounds) {
+      Object /* long */ paintPtr,
+      Object /* char[] */ text,
+      Object /* int */ start,
+      Object /* int */ end,
+      Object /* int */ contextStart,
+      Object /* int */ contextEnd,
+      Object /* boolean */ isRtl,
+      Object /* int */ offset,
+      Object /* float[] */ advances,
+      Object /* int */ advancesIndex,
+      Object /* RectF */ drawingBounds,
+      Object /* RunInfo */ runInfo) {
     return nGetRunCharacterAdvance(
-        paintPtr,
-        text,
-        start,
-        end,
-        contextStart,
-        contextEnd,
-        isRtl,
-        offset,
-        advances,
-        advancesIndex);
+        (long) paintPtr,
+        (char[]) text,
+        (int) start,
+        (int) end,
+        (int) contextStart,
+        (int) contextEnd,
+        (boolean) isRtl,
+        (int) offset,
+        (float[]) advances,
+        (int) advancesIndex);
   }
 
   /** Shadow picker for {@link Paint}. */
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPaint.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPaint.java
index d56a7d7e5..e5bbc8287 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPaint.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPaint.java
@@ -577,28 +577,29 @@ public class ShadowPaint {
 
   @Implementation(minSdk = V.SDK_INT)
   protected static float nGetRunCharacterAdvance(
-      long paintPtr,
-      char[] text,
-      int start,
-      int end,
-      int contextStart,
-      int contextEnd,
-      boolean isRtl,
-      int offset,
-      float[] advances,
-      int advancesIndex,
-      RectF drawingBounds) {
+      Object /* long */ paintPtr,
+      Object /* char[] */ text,
+      Object /* int */ start,
+      Object /* int */ end,
+      Object /* int */ contextStart,
+      Object /* int */ contextEnd,
+      Object /* boolean */ isRtl,
+      Object /* int */ offset,
+      Object /* float[] */ advances,
+      Object /* int */ advancesIndex,
+      Object /* RectF */ drawingBounds,
+      Object /* RunInfo */ runInfo) {
     return nGetRunCharacterAdvance(
-        paintPtr,
-        text,
-        start,
-        end,
-        contextStart,
-        contextEnd,
-        isRtl,
-        offset,
-        advances,
-        advancesIndex);
+        (long) paintPtr,
+        (char[]) text,
+        (int) start,
+        (int) end,
+        (int) contextStart,
+        (int) contextEnd,
+        (boolean) isRtl,
+        (int) offset,
+        (float[]) advances,
+        (int) advancesIndex);
   }
 
   @Implementation(minSdk = N, maxSdk = O_MR1)