diff options
| author | d34d <clark@cyngn.com> | 2015-09-25 12:57:56 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2015-10-27 18:29:18 -0700 |
| commit | 37e6e22d01d08aaf3a37b02db99b5acfe9f5fa1a (patch) | |
| tree | 3b9f84bcbcf939f752ea53941e70b183fadd7773 /core/java/android/app/ContextImpl.java | |
| parent | 4caecd77ab54833f6721af0da686e4d4d1225ca0 (diff) | |
| download | frameworks_base-37e6e22d01d08aaf3a37b02db99b5acfe9f5fa1a.zip frameworks_base-37e6e22d01d08aaf3a37b02db99b5acfe9f5fa1a.tar.gz frameworks_base-37e6e22d01d08aaf3a37b02db99b5acfe9f5fa1a.tar.bz2 | |
Themes: Don't recreate theme when mTheme is null
Change-Id: Idfa1c0799bb804956663ab1473b12fb1d4b44b8d
TICKET: CYNGNOS-1139
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 3667914..a9d2ea1 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -273,9 +273,11 @@ class ContextImpl extends Context { @Override public void recreateTheme() { - Resources.Theme newTheme = mResources.newTheme(); - newTheme.applyStyle(mThemeResource, true); - mTheme.setTo(newTheme); + if (mTheme != null) { + Resources.Theme newTheme = mResources.newTheme(); + newTheme.applyStyle(mThemeResource, true); + mTheme.setTo(newTheme); + } } @Override |