diff options
author | Martijn Coenen <maco@google.com> | 2012-04-06 13:47:52 -0700 |
---|---|---|
committer | Martijn Coenen <maco@google.com> | 2012-04-20 11:10:58 -0700 |
commit | 8099f5e7bfa7227ba674b5f0076f331e737bafd7 (patch) | |
tree | 44d1942249ed12d1f0d91e25d2157f2054cc302d /src/com/android/bluetooth/opp/BluetoothOppTransfer.java | |
parent | a4e5a2b1e7fc398285e304caf7019572dce3d16f (diff) | |
download | android_packages_apps_Bluetooth-8099f5e7bfa7227ba674b5f0076f331e737bafd7.tar.gz android_packages_apps_Bluetooth-8099f5e7bfa7227ba674b5f0076f331e737bafd7.tar.bz2 android_packages_apps_Bluetooth-8099f5e7bfa7227ba674b5f0076f331e737bafd7.zip |
Additional changes to support Bluetooth Beam.
- Added a whitelist permission, to ensure only system
services (such as NFC) can whitelist MAC addresses.
- Added HANDOVER_STATUS permission, to ensure handover
transfer status can only be received by eligible services
(such as NFC).
- Added new confirmation type HANDOVER_CONFIRMED; this indicates
the transfer was initiated by a handover, and doesn't need to be
confirmed. This type is also reused to send broadcasts
to the NFC service, so the NFC service can show notifications
and deal with the received data.
- Added 15 second timeout to whitelist.
- Modify notication code to not show any notifications for handover
transfers; instead, send broadcasts to indicate handover status.
- Modify "transfer complete" code to sendbroasts to indicate handover
status.
Change-Id: I00c08e09eaf44f0bd4bd837cb6b0c37b802742bc
Diffstat (limited to 'src/com/android/bluetooth/opp/BluetoothOppTransfer.java')
-rwxr-xr-x | src/com/android/bluetooth/opp/BluetoothOppTransfer.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java index 87703a82d..ec9c7db46 100755 --- a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java +++ b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java @@ -481,6 +481,9 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch /* This transfer need user confirm */ if (V) Log.v(TAG, "processCurrentShare" + mCurrentShare.mId); mSession.addShare(mCurrentShare); + if (mCurrentShare.mConfirm == BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED) { + setConfirmed(); + } } /** @@ -778,8 +781,10 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch /* * TODO what if it's not auto confirmed? */ - if (mCurrentShare != null - && mCurrentShare.mConfirm == BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED) { + if (mCurrentShare != null && + (mCurrentShare.mConfirm == BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED || + mCurrentShare.mConfirm == + BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED)) { /* have additional auto confirmed share to process */ if (V) Log.v(TAG, "Transfer continue session for info " + mCurrentShare.mId + " from batch " + mBatch.mId); |