| Index: chrome/android/java/src/org/chromium/chrome/browser/nfc/BeamController.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/nfc/BeamController.java b/chrome/android/java/src/org/chromium/chrome/browser/nfc/BeamController.java
|
| index 105daa63a9b7e3a2e53e9b61bd271b6da7059251..8e9f5b1c016d552a1e364a0fcb4dabb83e90b58d 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/nfc/BeamController.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/nfc/BeamController.java
|
| @@ -27,7 +27,7 @@ public final class BeamController {
|
| final BeamCallback beamCallback = new BeamCallback(activity, provider);
|
| nfcAdapter.setNdefPushMessageCallback(beamCallback, activity);
|
| nfcAdapter.setOnNdefPushCompleteCallback(beamCallback, activity);
|
| - } catch (IllegalStateException e) {
|
| + } catch (IllegalStateException | SecurityException e) {
|
| Log.w("BeamController", "NFC registration failure. Can't retry, giving up.");
|
| }
|
| }
|
|
|