From 425e719c462edbedd66ccec14667357ab409a483 Mon Sep 17 00:00:00 2001
From: Roozbeh Pournader <roozbeh@google.com>
Date: Wed, 24 May 2017 15:16:55 -0700
Subject: [PATCH] Update Paint#mFontVariationSettings in set() and reset()

Change-Id: I2dc41a998c940c4a4a98a06aaa6038cbca457186
Fixes: 62066408
Test: none
---
 graphics/java/android/graphics/Paint.java | 2 ++
 1 file changed, 2 insertions(+)

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