Merge "Clear updated font files in safe mode." into sc-dev

2021-05-14 20:55:52 +00:00
parent 673a8c593c d18a901b23
commit 7c4e5a69b0
5 changed files with 67 additions and 34 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1793,7 +1793,7 @@ public final class SystemServer implements Dumpable {
            t.traceEnd();

            t.traceBegin("StartFontManagerService");
-            mSystemServiceManager.startService(FontManagerService.Lifecycle.class);
+            mSystemServiceManager.startService(new FontManagerService.Lifecycle(context, safeMode));
            t.traceEnd();

            t.traceBegin("StartTextServicesManager");