Fix bug: use foreground dispatch when ndef push is enabled via callback.

The previous code only checked for a static message, not the callback.

Change-Id: Ib0f2db42423ca8b11ece7f4b20adb7969911c8ba

2 files changed, 3 insertions, 3 deletions

diff --git a/src/com/android/nfc/NdefP2pManager.java b/src/com/android/nfc/NdefP2pManager.java
index 9f1dadc..640e6ff 100755
--- a/src/com/android/nfc/NdefP2pManager.java
+++ b/src/com/android/nfc/NdefP2pManager.java
@@ -168,9 +168,9 @@ public class NdefP2pManager {
         }
     }
 
-    public NdefMessage getForegroundMessage() {
+    public boolean isForegroundPushEnabled() {
         synchronized (this) {
-            return mForegroundMsg;
+            return mForegroundMsg != null || mCallback != null;
         }
     }
 
diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java
index 669f1d4..cdc4108 100644
--- a/src/com/android/nfc/NfcDispatcher.java
+++ b/src/com/android/nfc/NfcDispatcher.java
@@ -96,7 +96,7 @@ public class NfcDispatcher {
         IntentFilter[] overrideFilters;
         PendingIntent overrideIntent;
         String[][] overrideTechLists;
-        boolean foregroundNdefPush = mP2pManager.getForegroundMessage() != null;
+        boolean foregroundNdefPush = mP2pManager.isForegroundPushEnabled();
         synchronized (this) {
             overrideFilters = mOverrideFilters;
             overrideIntent = mOverrideIntent;