diff options
| author | Martijn Coenen <maco@google.com> | 2016-06-21 15:08:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 15:08:59 +0000 |
| commit | 339bd3a1ca14287f4d99994b9be6f0aae3605450 (patch) | |
| tree | e80a1709783dcc9527162498f650254b773928d4 | |
| parent | 839f30fd187474a7c8356e645125caca1d197533 (diff) | |
| parent | 06486f58530d456a9a8d99bf14936539b3540dde (diff) | |
| download | android_packages_apps_Nfc-339bd3a1ca14287f4d99994b9be6f0aae3605450.tar.gz android_packages_apps_Nfc-339bd3a1ca14287f4d99994b9be6f0aae3605450.tar.bz2 android_packages_apps_Nfc-339bd3a1ca14287f4d99994b9be6f0aae3605450.zip | |
Allow peripheral/WiFi handover in provision mode.
am: 06486f5853
Change-Id: Ia7e2f3d5e226b491313897652944456e1fa2fa63
| -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; } |