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

Commit fb77ca60 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Guard against NPE" into oc-mr1-dev

parents 0859c09d 88789a9a

services/core/java/com/android/server/policy/LegacyGlobalActions.java

+8 −5
Original line number Diff line number Diff line
@@ -202,11 +202,14 @@ class LegacyGlobalActions implements DialogInterface.OnDismissListener, DialogIn 
                && !(mAdapter.getItem(0) instanceof LongPressAction)) {

            ((SinglePressAction) mAdapter.getItem(0)).onPress();

        } else {

            if (mDialog != null) {

                WindowManager.LayoutParams attrs = mDialog.getWindow().getAttributes();

                attrs.setTitle("LegacyGlobalActions");

                mDialog.getWindow().setAttributes(attrs);

                mDialog.show();

            mDialog.getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_DISABLE_EXPAND);

                mDialog.getWindow().getDecorView().setSystemUiVisibility(

                        View.STATUS_BAR_DISABLE_EXPAND);

            }

        }

    }