From 203949507666058b2fb3b1f4dd9da98c2f733e18 Mon Sep 17 00:00:00 2001 From: arthurhung Date: Wed, 20 May 2020 12:06:38 +0800 Subject: [PATCH] Fix NPE in LegacyGlobalActions The dialog would be assigned by 'createDialog', we should use local varible to prevent null pointer. Bug: 156747189 Test: atest GlobalActionsImeTest Test: open chrome, browsing and open global menu. Change-Id: I572426158c63bbce22c79dc2e0e642914da0fd24 --- .../java/com/android/server/policy/LegacyGlobalActions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/policy/LegacyGlobalActions.java b/services/core/java/com/android/server/policy/LegacyGlobalActions.java index 39f7ac0b5b54b..9c3a394400543 100644 --- a/services/core/java/com/android/server/policy/LegacyGlobalActions.java +++ b/services/core/java/com/android/server/policy/LegacyGlobalActions.java @@ -339,7 +339,7 @@ class LegacyGlobalActions implements DialogInterface.OnDismissListener, DialogIn }); dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); // 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);