Skip to content

Commit 31f6c16

Browse files
author
Michael Thiessen
committed
Prevent possible crash unregistering VR BroadcastReceiver
I only saw this crash once, and can't reproduce, but better safe than sorry. BUG=712823 Review-Url: https://codereview.chromium.org/2830463002 Cr-Commit-Position: refs/heads/master@{#465702} (cherry picked from commit 3eb6c9f) Review-Url: https://codereview.chromium.org/2826213002 . Cr-Commit-Position: refs/branch-heads/3071@{#62} Cr-Branched-From: a106f0a-refs/heads/master@{#464641}
1 parent 075f4f0 commit 31f6c16

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,11 @@ public void onReceive(Context context, Intent intent) {
157157
public void unregister() {
158158
ChromeActivity activity = mTargetActivity.get();
159159
if (activity == null) return;
160-
activity.unregisterReceiver(VrBroadcastReceiver.this);
160+
try {
161+
activity.unregisterReceiver(VrBroadcastReceiver.this);
162+
} catch (IllegalArgumentException e) {
163+
// Ignore this. This means our receiver was already unregistered somehow.
164+
}
161165
}
162166
}
163167

0 commit comments

Comments
 (0)