Merge "Fix NPE in LegacyGlobalActions" into rvc-dev am: e3041c9a16

Change-Id: I007dd45abc559c4f11f1db9376afad51c0057708
This commit is contained in:
TreeHugger Robot
2020-05-20 11:49:54 +00:00
committed by Automerger Merge Worker

View File

@@ -339,7 +339,7 @@ class LegacyGlobalActions implements DialogInterface.OnDismissListener, DialogIn
}); });
dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
// Don't acquire soft keyboard focus, to avoid destroying state when capturing bugreports // Don't acquire soft keyboard focus, to avoid destroying state when capturing bugreports
mDialog.getWindow().setFlags(FLAG_ALT_FOCUSABLE_IM, FLAG_ALT_FOCUSABLE_IM); dialog.getWindow().setFlags(FLAG_ALT_FOCUSABLE_IM, FLAG_ALT_FOCUSABLE_IM);
dialog.setOnDismissListener(this); dialog.setOnDismissListener(this);