Merge "Remove unused code"

Author: Romain Guy

graphics/java/android/graphics/Paint.java

@@ -2144,8 +2144,6 @@ private static native int native_setRasterizer(int native_object,
     private static native void native_setTextAlign(int native_object,
                                                    int align);
 
-    private static native float native_getFontMetrics(int native_paint,
-                                                      FontMetrics metrics);
     private static native int native_getTextWidths(int native_object,
                             char[] text, int index, int count, float[] widths);
     private static native int native_getTextWidths(int native_object,

tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java

@@ -903,17 +903,6 @@ public Rasterizer_Delegate getRasterizer() {
         delegate.mTextAlign = align;
     }
 
-    @LayoutlibDelegate
-    /*package*/ static float native_getFontMetrics(int native_paint, FontMetrics metrics) {
-        // get the delegate from the native int.
-        Paint_Delegate delegate = sManager.getDelegate(native_paint);
-        if (delegate == null) {
-            return 0.f;
-        }
-
-        return delegate.getFontMetrics(metrics);
-    }
-
     @LayoutlibDelegate
     /*package*/ static int native_getTextWidths(int native_object, char[] text, int index,
             int count, float[] widths) {