Merge "Use currentTimeMillis instead of epoch seconds" into sc-dev

1 files changed, 2 insertions, 1 deletions

diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 32c777cf498c..ac5b4e92c054 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -172,7 +172,7 @@ public class Typeface {
      * @hide
      */
     @UnsupportedAppUsage
-    public long native_instance;
+    public final long native_instance;
 
     private Runnable mCleaner;
 
@@ -207,6 +207,7 @@ public class Typeface {
     private static final int STYLE_NORMAL = 0;
     private static final int STYLE_ITALIC = 1;
 
+    @GuardedBy("this")
     private int[] mSupportedAxes;
     private static final int[] EMPTY_AXES = {};