Merge "Don't crash trying to unregister a receiver twice." into sc-dev am: 8905807ad9 am: e8ffd4a17e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15274654

Change-Id: Ifb4e2924060c2558d64d4cfecf92fd3b7f603bbe
This commit is contained in:
Josh Tsuji
2021-07-14 15:44:46 +00:00
committed by Automerger Merge Worker

View File

@@ -101,7 +101,12 @@ abstract public class SafetyWarningDialog extends SystemUIDialog
@Override
public void onDismiss(DialogInterface unused) {
mContext.unregisterReceiver(mReceiver);
try {
mContext.unregisterReceiver(mReceiver);
} catch (IllegalArgumentException e) {
// Don't crash if the receiver has already been unregistered.
e.printStackTrace();
}
cleanUp();
}