commit 1ee4894e6c3c421937c3a229de5c87132aac369e
author Roozbeh Pournader <roozbeh@google.com> Tue May 30 21:25:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 30 21:25:23 2017 +0000
tree 535856f14b3a7a7aefe4421e90d1bd8d97b49556
parent 4f65a37a56c7b818fbdfbfa287df27a143d43717
parent d865c624bda8130bdb03238e875dec9df5491e25

Merge "Update Paint#mFontVariationSettings in set() and reset()" into oc-dev
am: d865c624bd

Change-Id: I45e58aa1a1ac7b5319a891e3d4f449099b13384d

graphics/java/android/graphics/Paint.java

diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index e62df8f..b5b9fdb 100644
--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
@@ -529,6 +529,7 @@
         setTextLocales(LocaleList.getAdjustedDefault());
         setElegantTextHeight(false);
         mFontFeatureSettings = null;
+        mFontVariationSettings = null;
     }
 
     /**
@@ -565,6 +566,7 @@
         mBidiFlags = paint.mBidiFlags;
         mLocales = paint.mLocales;
         mFontFeatureSettings = paint.mFontFeatureSettings;
+        mFontVariationSettings = paint.mFontVariationSettings;
     }
 
     /** @hide */