commit 40c0f71cd23f2b1db4d67fca923ec3f951e78a14
author Jerome Gaillard <jgaillard@google.com> Thu Jan 28 11:51:21 2021 +0000
committer Jerome Gaillard <jgaillard@google.com> Thu Jan 28 11:51:26 2021 +0000
tree e5f7ea280f5e9cdda6001b4a21da365837a63093
parent 9d293b304199351449b0127bb8cf623226f4e809
parent 3e58f1bd447be6231bbb93f2578b2f221f1dd7fd

resolve merge conflicts of 3e58f1bd447be6231bbb93f2578b2f221f1dd7fd to master-layoutlib-native

Change-Id: Ib11be12d12de2aa434ccc763fda58c055dc00c5a

delegates/src/android/graphics/fonts/SystemFonts_Delegate.java

diff --git a/delegates/src/android/graphics/fonts/SystemFonts_Delegate.java b/delegates/src/android/graphics/fonts/SystemFonts_Delegate.java
index 938b6ab..92291cf 100644
--- a/delegates/src/android/graphics/fonts/SystemFonts_Delegate.java
+++ b/delegates/src/android/graphics/fonts/SystemFonts_Delegate.java
@@ -58,10 +58,13 @@
             String systemFontDir,
             String oemXml,
             String productFontDir,
-            Map<String, File> updatableFontMap) {
+            Map<String, File> updatableFontMap,
+            long lastModifiedDate,
+            int configVersion) {
         sIsTypefaceInitialized = true;
         return SystemFonts.getSystemFontConfigInternal_Original(
-            sFontLocation + "native/fonts.xml", sFontLocation, null, null, updatableFontMap);
+            sFontLocation + "native/fonts.xml", sFontLocation, null, null, updatableFontMap,
+            lastModifiedDate, configVersion);
     }
 
     @LayoutlibDelegate