1 files changed, 26 insertions, 12 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePositionedGlyphs.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePositionedGlyphs.java
index 90a6f977a..5b65023af 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePositionedGlyphs.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePositionedGlyphs.java
@@ -1,6 +1,5 @@
 package org.robolectric.shadows;
 
-import android.graphics.text.MeasuredText;
 import android.graphics.text.PositionedGlyphs;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -8,57 +7,72 @@ import org.robolectric.nativeruntime.DefaultNativeRuntimeLoader;
 import org.robolectric.nativeruntime.PositionedGlyphsNatives;
 import org.robolectric.shadows.ShadowNativePositionedGlyphs.Picker;
 import org.robolectric.versioning.AndroidVersions.S;
+import org.robolectric.versioning.AndroidVersions.U;
+import org.robolectric.versioning.AndroidVersions.V;
 
 /** Shadow for {@link PositionedGlyphs} that is backed by native code */
-@Implements(value = PositionedGlyphs.class, minSdk = S.SDK_INT, shadowPicker = Picker.class)
+@Implements(
+    value = PositionedGlyphs.class,
+    minSdk = S.SDK_INT,
+    shadowPicker = Picker.class,
+    callNativeMethodsByDefault = true)
 public class ShadowNativePositionedGlyphs {
-  @Implementation
+  /**
+   * The {@link PositionedGlyphs} static initializer invokes its own native methods. This has to be
+   * deferred starting in Android V.
+   */
+  @Implementation(minSdk = V.SDK_INT)
+  protected static void __staticInitializer__() {
+    // deferred
+  }
+
+  @Implementation(maxSdk = U.SDK_INT)
   protected static int nGetGlyphCount(long minikinLayout) {
     return PositionedGlyphsNatives.nGetGlyphCount(minikinLayout);
   }
 
-  @Implementation
+  @Implementation(maxSdk = U.SDK_INT)
   protected static float nGetTotalAdvance(long minikinLayout) {
     return PositionedGlyphsNatives.nGetTotalAdvance(minikinLayout);
   }
 
-  @Implementation
+  @Implementation(maxSdk = U.SDK_INT)
   protected static float nGetAscent(long minikinLayout) {
     return PositionedGlyphsNatives.nGetAscent(minikinLayout);
   }
 
-  @Implementation
+  @Implementation(maxSdk = U.SDK_INT)
   protected static float nGetDescent(long minikinLayout) {
     return PositionedGlyphsNatives.nGetDescent(minikinLayout);
   }
 
-  @Implementation
+  @Implementation(maxSdk = U.SDK_INT)
   protected static int nGetGlyphId(long minikinLayout, int i) {
     return PositionedGlyphsNatives.nGetGlyphId(minikinLayout, i);
   }
 
-  @Implementation
+  @Implementation(maxSdk = U.SDK_INT)
   protected static float nGetX(long minikinLayout, int i) {
     return PositionedGlyphsNatives.nGetX(minikinLayout, i);
   }
 
-  @Implementation
+  @Implementation(maxSdk = U.SDK_INT)
   protected static float nGetY(long minikinLayout, int i) {
     return PositionedGlyphsNatives.nGetY(minikinLayout, i);
   }
 
-  @Implementation
+  @Implementation(maxSdk = U.SDK_INT)
   protected static long nGetFont(long minikinLayout, int i) {
     return PositionedGlyphsNatives.nGetFont(minikinLayout, i);
   }
 
-  @Implementation
+  @Implementation(maxSdk = U.SDK_INT)
   protected static long nReleaseFunc() {
     DefaultNativeRuntimeLoader.injectAndLoad();
     return PositionedGlyphsNatives.nReleaseFunc();
   }
 
-  /** Shadow picker for {@link MeasuredText}. */
+  /** Shadow picker for {@link PositionedGlyphs}. */
   public static final class Picker extends GraphicsShadowPicker<Object> {
     public Picker() {
       super(null, ShadowNativePositionedGlyphs.class);