diff options
| author | Pradeep Panigrahi <pradeepp@codeaurora.org> | 2013-08-29 11:34:03 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 18:58:49 -0600 |
| commit | e72106a462452d4284d595c30ebd55496cdcc5e7 (patch) | |
| tree | 63705bc0d83eecb763746d3ceedb930d0d1495f7 /src/com/android/bluetooth/opp | |
| parent | 543553328bd3bd7a43db88523206b79b6ad00aa6 (diff) | |
| download | android_packages_apps_Bluetooth-e72106a462452d4284d595c30ebd55496cdcc5e7.tar.gz android_packages_apps_Bluetooth-e72106a462452d4284d595c30ebd55496cdcc5e7.tar.bz2 android_packages_apps_Bluetooth-e72106a462452d4284d595c30ebd55496cdcc5e7.zip | |
Bluetooth: OPP: Display proper name while cancelling transfer
Saves names of all the selected files to be transferred even
before starting of client thread so that names remain intact
in the outbound information even when the batch is cancelled
from initiator.
Change-Id: I1763e6fee04dc8bbac943ec1db4d739d46f40939
(cherry picked from commit 6bb19d0c0829fc58a369fa7c509e46492ea497c9)
(cherry picked from commit 4ff3f8e74af2570ad560ca8e311e704bb2580a28)
(cherry picked from commit f11f07a1f02f8a9ce726721951a64133e3ec68a7)
Diffstat (limited to 'src/com/android/bluetooth/opp')
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java index dd8efe01f..5a8589bcf 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppManager.java +++ b/src/com/android/bluetooth/opp/BluetoothOppManager.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. * Copyright (c) 2008-2009, Motorola, Inc. * * All rights reserved. @@ -433,11 +434,14 @@ public class BluetoothOppManager { contentType = mTypeOfMultipleFiles; } + BluetoothOppSendFileInfo fileInfo = BluetoothOppSendFileInfo.generateFileInfo( + mContext, fileUri, contentType); ContentValues values = new ContentValues(); values.put(BluetoothShare.URI, fileUri.toString()); values.put(BluetoothShare.MIMETYPE, contentType); values.put(BluetoothShare.DESTINATION, mRemoteDevice.getAddress()); values.put(BluetoothShare.TIMESTAMP, ts); + values.put(BluetoothShare.FILENAME_HINT, fileInfo.mFileName); if (mIsHandoverInitiated) { values.put(BluetoothShare.USER_CONFIRMATION, BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED); |