Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clear reference to Global Actions Dialog after it is dismissed" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-25 16:13:41 +00:00
committed by Android (Google) Code Review
parent 3b179167af 05cda02158
commit b936ac7a23
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

@@ -417,9 +417,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
new GlobalActionsPanelPlugin.Callbacks() { new GlobalActionsPanelPlugin.Callbacks() {
@Override @Override
public void dismissGlobalActionsMenu() { public void dismissGlobalActionsMenu() {
if (mDialog != null) { dismissDialog();
mDialog.dismiss();
}
} }
@Override @Override
@@ -915,6 +913,9 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
/** {@inheritDoc} */ /** {@inheritDoc} */
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
if (mDialog == dialog) {
mDialog = null;
}
mWindowManagerFuncs.onGlobalActionsHidden(); mWindowManagerFuncs.onGlobalActionsHidden();
if (mShowSilentToggle) { if (mShowSilentToggle) {
try { try {