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

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

Make sure ThemeConfig is non-null when loading resources 

When the device boots into safemode, the theme config will end up
being null and we need to check that prior to using it to retrieve
resources for the StatusBarIconView

This fixes CYAN-5009

Change-Id: I1a90bc9f9c65cb41a6e58947bbd1b6d7728a952b
parent 2323852b

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+6 −2
Original line number Diff line number Diff line
@@ -197,8 +197,12 @@ public class StatusBarIconView extends AnimatedImageView { 
                }

                PackageManager pm = context.getPackageManager();

                final ThemeConfig config = context.getResources().getConfiguration().themeConfig;

                if (config != null) {

                    final String pkgName = config.getOverlayPkgNameForApp(context.getPackageName());

                    r = pm.getThemedResourcesForApplicationAsUser(icon.iconPackage, pkgName, userId);

                } else {

                    r = context.getResources();

                }

            } catch (PackageManager.NameNotFoundException ex) {

                Log.e(TAG, "Icon package not found: " + icon.iconPackage);

                return null;