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

Commit e23c9e68 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Guard against NPE" into oc-mr1-dev am: fb77ca60 

am: 4aad2bbf

Change-Id: Ia2eb274027f6bdc5e427f13fe0dc3de849b6f779
parents 3ca15555 4aad2bbf

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);

            }

        }

    }