Merge "Don't crash trying to unregister a receiver twice." into sc-dev

2021-07-14 15:21:29 +00:00
parent a40b1cb418 de5cc5110e
commit 8905807ad9
1 changed files with 6 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java
@@ -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();
    }