OSDN Git Service

Additional changes to support Bluetooth Beam.
authorMartijn Coenen <maco@google.com>
Fri, 6 Apr 2012 20:47:52 +0000 (13:47 -0700)
committerMartijn Coenen <maco@google.com>
Fri, 20 Apr 2012 18:10:58 +0000 (11:10 -0700)
commit8099f5e7bfa7227ba674b5f0076f331e737bafd7
tree44d1942249ed12d1f0d91e25d2157f2054cc302d
parenta4e5a2b1e7fc398285e304caf7019572dce3d16f
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
14 files changed:
AndroidManifest.xml
res/values/strings.xml
src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java [new file with mode: 0644]
src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
src/com/android/bluetooth/opp/BluetoothOppManager.java
src/com/android/bluetooth/opp/BluetoothOppNotification.java
src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
src/com/android/bluetooth/opp/BluetoothOppProvider.java
src/com/android/bluetooth/opp/BluetoothOppReceiver.java
src/com/android/bluetooth/opp/BluetoothOppTransfer.java
src/com/android/bluetooth/opp/BluetoothOppTransferInfo.java
src/com/android/bluetooth/opp/BluetoothOppUtility.java
src/com/android/bluetooth/opp/BluetoothShare.java
src/com/android/bluetooth/opp/Constants.java