commit 57a5145a01995c4f854a9b196eaf402c28bba441
author Hiroki Yamamoto <hiroki.yamamoto@sonymobile.com> Tue Mar 28 11:45:13 2017 +0900
committer Andre Eisenbach <eisenbach@google.com> Tue Apr 04 20:56:36 2017 +0000
tree fa41a8717ffc4656a34b90376a5a5582f7963ed7
parent c29fff50322599f53feadf9cf87df9956c9ac44e

Protect CANCEL_HANDOVER_TRANSFER broadcast

Bug: 36662809
Test: cancel AndroidBeam and check if the error log is not shown
Change-Id: Ic442753aacf97f7f5a7e449685c2b1414e77e957

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index c1a7c77..460d466 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -279,6 +279,7 @@
     <protected-broadcast android:name="android.btopp.intent.action.STOP_HANDOVER_TRANSFER" />
     <protected-broadcast android:name="android.nfc.handover.intent.action.HANDOVER_SEND" />
     <protected-broadcast android:name="android.nfc.handover.intent.action.HANDOVER_SEND_MULTIPLE" />
+    <protected-broadcast android:name="com.android.nfc.handover.action.CANCEL_HANDOVER_TRANSFER" />
 
     <protected-broadcast android:name="android.intent.action.CLEAR_DNS_CACHE" />
     <protected-broadcast android:name="android.intent.action.PROXY_CHANGE" />