Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f620c78 authored by Clark Scheff's avatar Clark Scheff Committed by Gerrit Code Review
Browse files

Merge "CM11 Themes: Ensure customTheme is not null." into cm-11.0

parents c66f6749 04a18236

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;

    }