Merge "Don't crash trying to unregister a receiver twice." into sc-dev am: 8905807ad9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15274654 Change-Id: I386ee68984532524dabc9bb1ac48bbb5902e2646
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user