diff --git a/core/java/android/text/AndroidBidi.java b/core/java/android/text/AndroidBidi.java
index b1c07f592c793..bbe152321a386 100644
--- a/core/java/android/text/AndroidBidi.java
+++ b/core/java/android/text/AndroidBidi.java
@@ -18,11 +18,14 @@ package android.text;
 
 import android.text.Layout.Directions;
 
+import com.android.internal.annotations.VisibleForTesting;
+
 /**
  * Access the ICU bidi implementation.
  * @hide
  */
-/* package */ class AndroidBidi {
+@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+public class AndroidBidi {
 
     public static int bidi(int dir, char[] chs, byte[] chInfo, int n, boolean haveInfo) {
         if (chs == null || chInfo == null) {
diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java
index 5b5cdd243eee4..3c7741d8fea6a 100644
--- a/core/java/android/text/DynamicLayout.java
+++ b/core/java/android/text/DynamicLayout.java
@@ -20,6 +20,7 @@ import android.graphics.Paint;
 import android.text.style.UpdateLayout;
 import android.text.style.WrapTogetherSpan;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.GrowingArrayUtils;
 
@@ -449,7 +450,8 @@ public class DynamicLayout extends Layout
      *
      * @hide
      */
-    void updateBlocks(int startLine, int endLine, int newLineCount) {
+    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+    public void updateBlocks(int startLine, int endLine, int newLineCount) {
         if (mBlockEndLines == null) {
             createBlocks();
             return;
@@ -549,7 +551,8 @@ public class DynamicLayout extends Layout
      * This package private method is used for test purposes only
      * @hide
      */
-    void setBlocksDataForTest(int[] blockEndLines, int[] blockIndices, int numberOfBlocks) {
+    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+    public void setBlocksDataForTest(int[] blockEndLines, int[] blockIndices, int numberOfBlocks) {
         mBlockEndLines = new int[blockEndLines.length];
         mBlockIndices = new int[blockIndices.length];
         System.arraycopy(blockEndLines, 0, mBlockEndLines, 0, blockEndLines.length);
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 7e64fa9a967e4..f9afcc7ac36cd 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -30,6 +30,7 @@ import android.text.style.ParagraphStyle;
 import android.text.style.ReplacementSpan;
 import android.text.style.TabStopSpan;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.GrowingArrayUtils;
 
@@ -1943,8 +1944,17 @@ public abstract class Layout {
         // To simply test for an RTL direction, test the bit using
         // DIR_RTL_FLAG, if set then the direction is rtl.
 
-        /* package */ int[] mDirections;
-        /* package */ Directions(int[] dirs) {
+        /**
+         * @hide
+         */
+        @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+        public int[] mDirections;
+
+        /**
+         * @hide
+         */
+        @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+        public Directions(int[] dirs) {
             mDirections = dirs;
         }
     }
@@ -2087,9 +2097,14 @@ public abstract class Layout {
 
     private static final int TAB_INCREMENT = 20;
 
-    /* package */ static final Directions DIRS_ALL_LEFT_TO_RIGHT =
+    /** @hide */
+    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+    public static final Directions DIRS_ALL_LEFT_TO_RIGHT =
         new Directions(new int[] { 0, RUN_LENGTH_MASK });
-    /* package */ static final Directions DIRS_ALL_RIGHT_TO_LEFT =
+
+    /** @hide */
+    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+    public static final Directions DIRS_ALL_RIGHT_TO_LEFT =
         new Directions(new int[] { 0, RUN_LENGTH_MASK | RUN_RTL_FLAG });
 
 }
diff --git a/core/java/android/text/PackedIntVector.java b/core/java/android/text/PackedIntVector.java
index 546ab440abf5c..3e5bf56778539 100644
--- a/core/java/android/text/PackedIntVector.java
+++ b/core/java/android/text/PackedIntVector.java
@@ -16,6 +16,7 @@
 
 package android.text;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.GrowingArrayUtils;
 
@@ -24,8 +25,11 @@ import com.android.internal.util.GrowingArrayUtils;
  * PackedIntVector stores a two-dimensional array of integers,
  * optimized for inserting and deleting rows and for
  * offsetting the values in segments of a given column.
+ *
+ * @hide
  */
-class PackedIntVector {
+@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+public class PackedIntVector {
     private final int mColumns;
     private int mRows;
 
diff --git a/core/tests/coretests/src/android/text/StaticLayoutTest.java b/core/tests/coretests/src/android/text/StaticLayoutTest.java
index cbed96caf3480..a0c3be416b465 100644
--- a/core/tests/coretests/src/android/text/StaticLayoutTest.java
+++ b/core/tests/coretests/src/android/text/StaticLayoutTest.java
@@ -163,7 +163,7 @@ public class StaticLayoutTest extends TestCase {
         assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
                 fmi.top, fmi.descent + spacingAdd,
                 fmi.ascent, fmi.descent + spacingAdd,
-                fmi.ascent, fmi.bottom + spacingAdd);
+                fmi.ascent, fmi.bottom);
     }
 
     /**
@@ -185,7 +185,7 @@ public class StaticLayoutTest extends TestCase {
         assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
                 fmi.top, fmi.descent + s.scale(fmi.descent - fmi.top),
                 fmi.ascent, fmi.descent + s.scale(fmi.descent - fmi.ascent),
-                fmi.ascent, fmi.bottom + s.scale(fmi.bottom - fmi.ascent));
+                fmi.ascent, fmi.bottom);
     }
 
     /**
@@ -207,7 +207,7 @@ public class StaticLayoutTest extends TestCase {
         assertVertMetrics(l, fmi.top - fmi.ascent, fmi.bottom - fmi.descent,
                 fmi.top, fmi.descent + s.scale(fmi.descent - fmi.top),
                 fmi.ascent, fmi.descent + s.scale(fmi.descent - fmi.ascent),
-                fmi.ascent, fmi.bottom + s.scale(fmi.bottom - fmi.ascent));
+                fmi.ascent, fmi.bottom);
     }
 
     // ----- test utility classes and methods -----