From de5cc5110ea2be0d8be1e3fee309d502c34fe687 Mon Sep 17 00:00:00 2001
From: Josh Tsuji <tsuji@google.com>
Date: Tue, 13 Jul 2021 15:08:11 -0400
Subject: [PATCH] Don't crash trying to unregister a receiver twice.

Fixes: 190597198
Test: atest SystemUITests
Change-Id: I04c8cca24f9823bab5244126052d31d1b3549c5f
---
 .../com/android/systemui/volume/SafetyWarningDialog.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java b/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java
index 361604c461b4b..a40cf4f37cc3d 100644
--- 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();
     }