From afcfb67696f9e4244dded96cdf8f40e7d2259d15 Mon Sep 17 00:00:00 2001 From: d34d Date: Mon, 20 Jun 2016 10:33:13 -0700 Subject: [PATCH] Themes: Fix applying default theme ThemeUtils has method for getting the default theme package name which will return ThemeConfig.SYSTEM_DEFAULT if no default theme package is defined in CMSettings. Use this method rather than read the setting directly. Change-Id: I924f8ee116d97a8f3fcf4703214376608b31f297 --- .../org/cyanogenmod/platform/internal/ThemeManagerService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/ThemeManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/ThemeManagerService.java index 369d6522..2eaa4419 100644 --- a/cm/lib/main/java/org/cyanogenmod/platform/internal/ThemeManagerService.java +++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/ThemeManagerService.java @@ -485,8 +485,7 @@ public class ThemeManagerService extends CMSystemService { private void doApplyDefaultTheme() { final ContentResolver resolver = mContext.getContentResolver(); - final String defaultThemePkg = CMSettings.Secure.getString(resolver, - CMSettings.Secure.DEFAULT_THEME_PACKAGE); + final String defaultThemePkg = ThemeUtils.getDefaultThemePackageName(mContext); if (!TextUtils.isEmpty(defaultThemePkg)) { String defaultThemeComponents = CMSettings.Secure.getString(resolver, CMSettings.Secure.DEFAULT_THEME_COMPONENTS);