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

Merge "Prevent crash when unregsiter the broadcast" into tm-dev

Browse Source
This commit is contained in:
Arthur Hung
2022-03-29 06:19:04 +00:00
committed by Android (Google) Code Review
parent c49fa4a78a 33a01ec1b4
commit d7e447b4b9
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/AppWaitingForDebuggerDialog.java
View File

@@ -57,9 +57,6 @@ final class AppWaitingForDebuggerDialog extends BaseErrorDialog {
attrs.setTitle("Waiting For Debugger: " + app.info.processName);
getWindow().setAttributes(attrs);
}
public void onStop() {
}
@Override
protected void closeDialog() {

37
services/core/java/com/android/server/am/BaseErrorDialog.java
View File

@@ -16,6 +16,8 @@
package com.android.server.am;
import static android.content.Context.RECEIVER_EXPORTED;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -34,6 +36,7 @@ public class BaseErrorDialog extends AlertDialog {
private static final int DISABLE_BUTTONS = 1;
private boolean mConsuming = true;
private BroadcastReceiver mReceiver;
public BaseErrorDialog(Context context) {
super(context, com.android.internal.R.style.Theme_DeviceDefault_Dialog_AppError);
@@ -52,14 +55,33 @@ public class BaseErrorDialog extends AlertDialog {
super.onStart();
mHandler.sendEmptyMessage(DISABLE_BUTTONS);
mHandler.sendMessageDelayed(mHandler.obtainMessage(ENABLE_BUTTONS), 1000);
getContext().registerReceiver(mReceiver,
new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), Context.RECEIVER_EXPORTED);
if (mReceiver == null) {
mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) {
closeDialog();
}
}
};
getContext().registerReceiver(mReceiver,
new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), RECEIVER_EXPORTED);
}
}
@Override
protected void onStop() {
super.onStop();
getContext().unregisterReceiver(mReceiver);
if (mReceiver != null) {
try {
getContext().unregisterReceiver(mReceiver);
} catch (IllegalArgumentException e) {
// Receiver not registered exception.
android.util.Slog.e("BaseErrorDialog",
"unregisterReceiver threw exception: " + e.getMessage());
}
mReceiver = null;
}
}
public boolean dispatchKeyEvent(KeyEvent event) {
@@ -107,13 +129,4 @@ public class BaseErrorDialog extends AlertDialog {
dismiss();
}
}
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) {
closeDialog();
}
}
};
}

3
services/core/java/com/android/server/wm/FactoryErrorDialog.java
View File

@@ -37,9 +37,6 @@ final class FactoryErrorDialog extends BaseErrorDialog {
attrs.setTitle("Factory Error");
getWindow().setAttributes(attrs);
}
public void onStop() {
}
@Override
protected void closeDialog() {