Fix NFC onManualBeamInvoke issue with policy

Clear NFC data in onManualBeamInvoke, to avoid previously cached NFC
data from being used despite beam is disallowed by policy

Note: There is still a potential problem when onManualBeamInvoke is
invoked in app's onResume. If you start the work app, disallow in
policy, then call onManualBeamInvoke in onResume, beam will still be
triggered and send out data. However, this is kind of an edge case as
app won't normally call onManualBeamInvoke in onResume, and only happens
if policy changed while the app has launched.

Bug: 21742271
Change-Id: Ib1bf340fd727962590b21945b253c980f079c0b8

1 files changed, 3 insertions, 0 deletions

diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java
index 6139199a..b0835491 100755
--- a/src/com/android/nfc/P2pLinkManager.java
+++ b/src/com/android/nfc/P2pLinkManager.java
@@ -331,6 +331,9 @@ class P2pLinkManager implements Handler.Callback, P2pEventListener.Callback {
             if (mForegroundUtils.getForegroundUids().contains(mNdefCallbackUid)) {
                 // Try to get data from the registered NDEF callback
                 prepareMessageToSend(false);
+            } else {
+                mMessageToSend = null;
+                mUrisToSend = null;
             }
             if (mMessageToSend == null && mUrisToSend == null && shareData != null) {
                 // No data from the NDEF callback, get data from ShareData