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

Commit cd6993fa authored by d34d's avatar d34d
Browse files

SysUI: Use system theme when currentTheme is null 

It is possible for the current theme to be null, as is the case when
the device is in safe mode, so we should use the system theme in this
case rather than have a null object.

Change-Id: Ifd9db1febd9169c68cb25ec12971830b9260e2bb
REF: CYAN-6186
parent f2f70e68

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+2 −0
Original line number Diff line number Diff line
@@ -537,6 +537,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        ThemeConfig currentTheme = mContext.getResources().getConfiguration().themeConfig;

        if (currentTheme != null) {

            mCurrentTheme = (ThemeConfig)currentTheme.clone();

        } else {

            mCurrentTheme = ThemeConfig.getSystemTheme();

        }



        mLocationController = new LocationController(mContext);