Themes: Check if updateConfiguration should be called

Some components do not require us to update the configuration so
we should check for the components that do require a config
change and only then update the configuration.

Change-Id: I8efc00627e82ceff9d1e5262d1a7d6247ad44a58

1 files changed, 12 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/ThemeService.java b/services/core/java/com/android/server/ThemeService.java
index d2fa28e..faf8502 100644
--- a/services/core/java/com/android/server/ThemeService.java
+++ b/services/core/java/com/android/server/ThemeService.java
@@ -424,7 +424,9 @@ public class ThemeService extends IThemeService.Stub {
 
         updateProvider(request);
 
-        updateConfiguration(request, removePerAppTheme);
+        if (shouldUpdateConfiguration(request)) {
+            updateConfiguration(request, removePerAppTheme);
+        }
 
         killLaunchers(request);
 
@@ -729,6 +731,15 @@ public class ThemeService extends IThemeService.Stub {
         return true;
     }
 
+    private boolean shouldUpdateConfiguration(ThemeChangeRequest request) {
+        return request.getOverlayThemePackageName() != null ||
+                request.getFontThemePackageName() != null ||
+                request.getIconsThemePackageName() != null ||
+                request.getStatusBarThemePackageName() != null ||
+                request.getNavBarThemePackageName() != null ||
+                request.getPerAppOverlays().size() > 0;
+    }
+
     private static ThemeConfig.Builder createBuilderFrom(Configuration config,
             ThemeChangeRequest request, String pkgName, boolean removePerAppThemes) {
         ThemeConfig.Builder builder = new ThemeConfig.Builder(config.themeConfig);