Merge "Fix dark mode NPE" into qt-dev

2019-04-18 21:00:31 +00:00
parent f96a3cbaa3 a4e12ba205
commit b9cd46e163
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -438,7 +438,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
    @Override
    public void onUiModeChanged() {
        mContext.getTheme().applyStyle(mContext.getThemeResId(), true);
-        if (mDialog.isShowing()) {
+        if (mDialog != null && mDialog.isShowing()) {
            mDialog.refreshDialog();
        }
    }