diff options
| author | Martijn Coenen <maco@google.com> | 2016-06-21 10:26:48 +0200 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2016-06-21 10:27:49 +0200 |
| commit | 06486f58530d456a9a8d99bf14936539b3540dde (patch) | |
| tree | 240222a72457635f39961b7821537753834cf33c /src/com/android/nfc | |
| parent | 5d1ffeb3f31522c83a424a3e44e1adb7c328e7d0 (diff) | |
| download | android_packages_apps_Nfc-06486f58530d456a9a8d99bf14936539b3540dde.tar.gz android_packages_apps_Nfc-06486f58530d456a9a8d99bf14936539b3540dde.tar.bz2 android_packages_apps_Nfc-06486f58530d456a9a8d99bf14936539b3540dde.zip | |
Allow peripheral/WiFi handover in provision mode.
Bug: 29193031
Change-Id: I8bf0eee064c6a8eccfb52b091b0475e86ccdb8d9
Diffstat (limited to 'src/com/android/nfc')
| -rw-r--r-- | src/com/android/nfc/NfcDispatcher.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java index 45a6b385..ff86d6a3 100644 --- a/src/com/android/nfc/NfcDispatcher.java +++ b/src/com/android/nfc/NfcDispatcher.java @@ -272,6 +272,16 @@ class NfcDispatcher { return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS; } + if (tryPeripheralHandover(message)) { + if (DBG) Log.i(TAG, "matched BT HANDOVER"); + return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS; + } + + if (NfcWifiProtectedSetup.tryNfcWifiSetup(ndef, mContext)) { + if (DBG) Log.i(TAG, "matched NFC WPS TOKEN"); + return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS; + } + if (provisioningOnly) { if (message == null) { // We only allow NDEF-message dispatch in provisioning mode @@ -286,16 +296,6 @@ class NfcDispatcher { } } - if (tryPeripheralHandover(message)) { - if (DBG) Log.i(TAG, "matched BT HANDOVER"); - return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS; - } - - if (NfcWifiProtectedSetup.tryNfcWifiSetup(ndef, mContext)) { - if (DBG) Log.i(TAG, "matched NFC WPS TOKEN"); - return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS; - } - if (tryNdef(dispatch, message)) { return screenUnlocked ? DISPATCH_UNLOCK : DISPATCH_SUCCESS; } |