commit 45e935fc7e16f1e28e8655f0b9a30e41dc815e42
author Martijn Coenen <maco@google.com> Wed Mar 30 11:50:46 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 30 11:50:46 2016 +0000
tree b5218137c9893fdaf3cfb2c43417d8c5c940e4c5
parent f9c05ec573f6aff184ba0d40f43fa2641558d976
parent ff60d4478d2e05c04e792cd59a7cce19f9c12090

Merge "Allow foreground override in provision mode."

src/com/android/nfc/NfcDispatcher.java

diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java
index b10ff36..531d322 100644
--- a/src/com/android/nfc/NfcDispatcher.java
+++ b/src/com/android/nfc/NfcDispatcher.java
@@ -259,6 +259,17 @@
             }
         }
 
+        if (DBG) Log.d(TAG, "dispatch tag: " + tag.toString() + " message: " + message);
+
+        DispatchInfo dispatch = new DispatchInfo(mContext, tag, message);
+
+        resumeAppSwitches();
+
+        if (tryOverrides(dispatch, tag, message, overrideIntent, overrideFilters,
+                overrideTechLists)) {
+            return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS;
+        }
+
         if (provisioningOnly) {
             if (message == null) {
                 // We only allow NDEF-message dispatch in provisioning mode
@@ -273,17 +284,6 @@
             }
         }
 
-        if (DBG) Log.d(TAG, "dispatch tag: " + tag.toString() + " message: " + message);
-
-        DispatchInfo dispatch = new DispatchInfo(mContext, tag, message);
-
-        resumeAppSwitches();
-
-        if (tryOverrides(dispatch, tag, message, overrideIntent, overrideFilters,
-                overrideTechLists)) {
-            return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS;
-        }
-
         if (tryPeripheralHandover(message)) {
             if (DBG) Log.i(TAG, "matched BT HANDOVER");
             return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS;