diff options
| author | Alex Chau <alexchau@google.com> | 2015-07-29 18:10:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 18:10:30 +0000 |
| commit | 92f0024f7e0fb1b0e8c0d2dd80dd83aa5c528cec (patch) | |
| tree | 7dbd7bc6c107930ab92024fb92e4d446d18b3674 | |
| parent | 0b196bc5784de430ac75abd96f28f14e6b6042cd (diff) | |
| parent | 3ddd88c5fe51b59b8f31ec3679767398979a74c3 (diff) | |
| download | android_packages_apps_Nfc-92f0024f7e0fb1b0e8c0d2dd80dd83aa5c528cec.tar.gz android_packages_apps_Nfc-92f0024f7e0fb1b0e8c0d2dd80dd83aa5c528cec.tar.bz2 android_packages_apps_Nfc-92f0024f7e0fb1b0e8c0d2dd80dd83aa5c528cec.zip | |
am 3ddd88c5: am b896d429: am 79458517: Fix NFC onManualBeamInvoke issue with policy
* commit '3ddd88c5fe51b59b8f31ec3679767398979a74c3':
Fix NFC onManualBeamInvoke issue with policy
| -rwxr-xr-x | src/com/android/nfc/P2pLinkManager.java | 3 |
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 |