Commit 04a18236 authored May 06, 2014 by Clark Scheff

CM11 Themes: Ensure customTheme is not null.

The configuration retrieved via getConfiguration() sometimes contains
a null customTheme which results in the theme returning to holo when
applying a component such as icons.  Icons will change but styles
and fonts would return to the default.

Change-Id: Iac0cb8eed5de8fdc9fe8efd697d968f26e801c08

parent 5599a865

services/java/com/android/server/am/ActivityManagerService.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -14124,6 +14124,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		Configuration ci;
		synchronized(this) {
		ci = new Configuration(mConfiguration);
		if (ci.customTheme == null) {
		ci.customTheme = CustomTheme.getBootTheme(mContext.getContentResolver());
		}
		}
		return ci;
		}