| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| | |
git://codeaurora.org/platform/packages/apps/Bluetooth into cm-12.1
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
"AU_LINUX_ANDROID_LA.BF64.1.2.1_RB2.05.00.02.081.002"
Conflicts:
src/com/android/bluetooth/opp/BluetoothOppService.java
Change-Id: Ib9af52d253cf33902a82552c821d8e14626d9f75
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This change will ensure that data will be send to socket only after
congestion is cleared. Otherwise, if socket is already in congestion
and send the data before clearing, will cause transfer failure.
CRs-Fixed: 790313
Change-Id: I8847a9f3473d97cd6fadf24e293ac179418df457
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When multiple files are sent in a single OPP session, the user should be
prompted to accept/reject only once.
Bug: 17770561
Change-Id: I438116915883c5fdc2d743f13456006f66511c0f
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also correct a confirm status change check in updateShare.
Bug: 17770561, 18343032
Conflicts:
src/com/android/bluetooth/opp/BluetoothOppService.java
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
|
| | |/ /
| | |
| | |
| | |
| | | |
bug 17770561
Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This change will ensure that all the selected files in the batch will
be transfered properly. Otherwise, if actual file count is not used
before transfer start then client session will be disconnected after
reaching the count value that is send during session start and remaining
files will be ignored.
Also added pending update flags for any contentresolver changes so that
transfer status can be properly updated.
CRs-Fixed: 785276
Change-Id: Ia9f9d8a953614b2e0945ca9cfbd2ce026dd40e26
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Repro:
- Recevived some files via BT
- Go to "show received files" interface.
- open a file(e.g. a picture)
- Observe: The item disappeared
Change-Id: I9597b829ac5f57c0ca3c7140e99d50f054a1b00d
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Renamed some variable.
* Re-organized the comment.
* Reworded the commit message.
This patch will make OBEX server respect the "accept all files"
setting. If enabled, it will skip checking MIME type of incoming file,
so the file types not present in whitelist can be accepted.
Blacklist will be ignored as well. (There's nothing in blacklist in fact)
If it's disabled, the check will be performed as usual.
Change-Id: I3904a25914d16d040126de43f5e6ed51993494c4
|
| | | |
| | |
| | |
| | |
| | |
| | | |
* Also remove Chinese CAF translations
Change-Id: I325da1fa32d91634a240ce3070d4bd7fe75f9f68
|
| | |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some dialogs imported from CAF are still using a Holo style, this
patch changes those to material and changes some layouts for better
usability:
1) Changes the enable dialog when something is shared via BT and it is off.
2) Changes the enabling progress dialog.
3) Removes a Toast (visible in screenshots)
4) Sets a transparent theme on the intent receiver, it's only a forwarding
activity but it is up for enough time and shows a ugly incomplete view
that immediately disappears.
Change-Id: Ia3f64f7d22a6486565df3035d22883e8d216dbe0
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Android 5.1.0 release 1
Conflicts:
src/com/android/bluetooth/btservice/AdapterService.java
src/com/android/bluetooth/gatt/AdvertiseManager.java
src/com/android/bluetooth/gatt/ScanManager.java
src/com/android/bluetooth/hfp/HeadsetPhoneState.java
src/com/android/bluetooth/hfp/HeadsetStateMachine.java
src/com/android/bluetooth/map/BluetoothMapContent.java
src/com/android/bluetooth/map/BluetoothMapContentObserver.java
src/com/android/bluetooth/map/BluetoothMapEmailSettingsLoader.java
src/com/android/bluetooth/map/BluetoothMapObexServer.java
src/com/android/bluetooth/map/BluetoothMapService.java
src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
src/com/android/bluetooth/opp/BluetoothOppService.java
src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
Change-Id: Ic7a754ea29d6124d7e53b6f13eed181d3f7e64e5
|
| | |
| |
| |
| |
| |
| |
| |
| | |
When multiple files are sent in a single OPP session, the user should be
prompted to accept/reject only once.
Bug: 17770561
Change-Id: I438116915883c5fdc2d743f13456006f66511c0f
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Initialization of mContentView was removed in commit
addfd25b639047e8463772b14f249758bdb20fbc, but is still
referenced during timeout causing NPE. Remove reference
as it is not needed.
Bug: 18309654
Change-Id: Id42810a97d638fd761a32069b591fc2b647e3a67
|
| | |
| |
| |
| |
| |
| |
| | |
Also correct a confirm status change check in updateShare.
Bug: 17770561, 18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
|
| | |
| |
| |
| |
| | |
bug 17770561
Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
turned ON
Updated interrupted outbound or inbound unconfirmed shares status to
UNKNOWN_ERROR if outbound transfer is interrupted by hardware error,
BT turned off etc.
CRs-Fixed: 768298
Change-Id: I0b12add43812fab86cb83e3b2b8e63683f8603c5
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
OPPService threads should be synchronized to avoid race condition.
Otherwise, during incoming file request if bluetooth sub system
retarted due some hardware error and if remote sends the file
immediately bluetooth is recovered application may crash after
accepting the request due to race condition between database cleanup
thread and shareupdate thread.
CRs-Fixed: 767691
Change-Id: Ie7e7bf588f5b8347afed6449898825111c41ae26
|
| |\ \ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Cleanup OPP threads during Bluetooth is turing OFF. Otherwise,
if threads are in sleep during turn off and try to resend the failed
transfer immediately after Bluetooth is turned ON transfer won't
start and there are no status update in UI.
CRs-Fixed: 766506
Change-Id: Ibf06bf25af587df0982845d3300fced3c56bbd46
|
| |\ \ \
| |/ /
|/| | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Share status of the file will be sent with MSG_SHARE_COMPLETE to
avoid sending the file again during batch transfer. Otherwise, if
DUT is sending batch containing small files transfer will be completed
immediately and status may not be updated to correct state. This will
lead to send same file again and cause transfer failure which is already
sent and removed from the hashmap of pending shares.
CRs-Fixed: 765769
Change-Id: I6d1b708be014fe454357c5082e3e43a640a6f7d7
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
OPP notification thread should be running when file transfer is
via NFC because NFC module is listening to TRANSFER_PROGRESS intent
from notification. Otherwise, after 20 seconds NFC will turn OFF BT
and cause transfer failure.
CRs-Fixed: 762328
Change-Id: Ibf40439f1c304e878eb90bfa805d6994eb878c83
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
If receiving file size is in GBs int type will not be able to contain
actual size and will lead to failure. So change to long instead of
int.
CRs-Fixed: 756089
Change-Id: Idc069eb59311d4e56013454ae10b0ecd37314ddd
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
OBEX session cleanup should be initiated from corresponding session
instead of OPP Service. Otherwise, during batch transfer if next file
in the batch starts before updating the previous transfer that will
lead to mismatch in status. This will cause UI progress bar stall
and transfer failure.
CRs-Fixed: 756084
Change-Id: Ibfa787396fe5f4f5b678ebcb4bdd36cb6641a161
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Check the status of the display during ongoing transfer to avoid
creating new update threads for updating the transfer progress if
display is off. Otherwise, power consumption will increase even
though display is off because of starting new thread every one
second.
CRs-Fixed: 745331
Change-Id: I862a163d31cf9a174e907ccb48b92e7cf77b4441
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Notification thread will start when there an ongoingtransfer and
terminate when transfer is finished. Otherwise, new thread will be
created at every 1sec.
CRs-Fixed: 745331
Change-Id: I287b1b4e6c92e260cae2a931f2e6d5c0a08823ac
|
| | |
| |
| |
| |
| |
| |
| |
| | |
This changes contains fixes for sql resource leak and null pointer
exceptions report by klocwork tool.
CRs-Fixed: 741003
Change-Id: I85dbdf4a0cdbee64413865c334946c2301e9ef53
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When IncomingFileActivity is timed out, timeout is called which
tries to dereference mContentView object. But in L-release this
object is not created and while trying to dereference this object cause
NullPointerException and that leads to BT application crash.
CRs-Fixed: 740959
Change-Id: Iada201f8f8c96af93e4f5179c4106fd164de4599
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Single Contentresolver thread will be started to update UI progress
during transfer. Otherwise, multiple instances will cause fatal
exceptions and lead to application crash.
CRs-Fixed: 734425
Change-Id: I4a25a6949c6db4a16663d69567d5aa4effc5c8b4
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Transfer progress thread will starts during send/receive data to or
from stack to optimize the transfer progress between the sender and
receiver.
CRs-Fixed: 718755
Change-Id: I79f1ae7d357a5b56d407c65ab356df276f7ef42a
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch adds dynamic logging support for MAP, PBAP
and OPP data profiles.
OPP: Control Verbose logging runtime from adb shell
Support runtime VERBOSE logging control for OPP Server
or Client app implementation through "BluetoothOpp" TAG.
PBAP: Control Verbose logging runtime from adb shell.
Support runtime VERBOSE logging control for PBAP Server
App implementation through BluetoothPbapService TAG.
MAP: Set BluetoothMapService.VERBOSE to false from
code. Mark DEBUG for logs to be enabled by default.
OPP: Dump timestamp while send and receive file.
Add appropriate verbose logging.
CRs-fixed: 608230, 604523
Change-Id: Ia0db1ff0847d1f6822d53ecedc3f7095abed1fa5
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Deleting interrupted outbound content resolver entry when BT is
turned ON. Otherwise, during ongoing transfer if files are queued
and device rebooted. After booting up share entry will be picked up
from content resolver and display will show the toast message about
transfer failure.
CRs-Fixed: 703674
Change-Id: I26857c1b9cb57011c677468391b4f996e8bdf445
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Support OPP1.2 features. OBEX over L2CAP , SRM and SRMP.
Use javax.btobex lib instead of javax.obex for OBEX OPP,
MAP and PBAP profiles.
CRs-Fixed: 639499
Conflicts:
src/com/android/bluetooth/opp/BluetoothOppTransfer.java
src/com/android/bluetooth/map/BluetoothMapService.java
Conflicts:
Android.mk
src/com/android/bluetooth/map/BluetoothMapAuthenticator.java
src/com/android/bluetooth/map/BluetoothMapService.java
src/com/android/bluetooth/map/BluetoothMnsObexClient.java
Change-Id: I9b4e64dcc4eae44252334547d5478a12f5b9bef5
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Bluetooth-OPP: Restart OPP service on ACL disconnect
Whenever OPP service is forcefully stopped, it will get
restarted on reception of ACL disconnected intent from frameworks.
Change-Id: I8b976c44dc5edd62288fd87abd84a1831e820957
Bluetooth: OPP: set csv format as acceptable shareinbound types
Adding csv format to acceptable inbound types, to be able to
receive these file formats from remote device.
Change-Id: I4ef8da4672d021412f806276c9bc292db17bf0c5
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
Bluetooth: OPP: Change for updating BT recipients prompt information
This patch adds changes for getting the updated name of the BT recipient
during OPP in case the device name is getting changed in between the two
consecutive transfers.
Change-Id: I0d2102343638b693fe6e02bf27ac4c603ff86962
Bluetooth: OPP: null check for optional header length
Adding null check for optional header length in put request
to avoid NUll pointer Exception.
Change-Id: Iac3b96b3803fb0ac83a41e75b7dcc6ce1f7c982f
Bluetooth: OPP: Handle Try Again exception to retry write
When the write to socket is faster than BT maximum throughput
socket buffer gets full and it returns EAGAIN, writing application
has to retry in this case. This return value is thrown as exception
from JNI layer and has to be handled properly to retry the write
operation.
Change-Id: I14db1d85a2e406cf70ae3687db8b727baaba782b
Allow an empty file information to be stored in ContentValues
OPP implementation doesn't store an empty file information in
ContentValues though the file has a valid URI info and it is allowed
to transfer an empty file to the remote device. Due to which, in OPP
file transfer history it became an unknown file. The change enables
OPP to update the valid empty file info in ContentValues which can be
processed by a ContentResolver.
Change-Id: I852bf0d51dc00325854ff1e76436cf4f104ac85c
Cleanup Opp session during ACL disconnect
Process ACL_DISCONNECT message in OPP module to clean up
the transfer related data as soon as ACL is disconnected.
This removes the delay we observe in displaying File not received
message when Remote device's Battery is abbruptly taken out
or remote disconnects the ACL when authorization request is in
pending state in DUT.
Change-Id: Ie749990987e43a02636c4e573e706f615e58fe7b
Bluetooth: Mark proper file transfer status upon OBEX response timeout
This patch will handle the scenario of obex timeout which occurs due
to cancelling the transfer in between and trying sending again.
Change-Id: I92a269be6cd7e972ddc98b10f036b19e7aebbbe5
Bluetooth: Do not terminate session when a Batch contains an empty file
If an empty file is rejected by the remote device, client session is
terminated and remaining files in the batch also marked as failure.
This change continues to send the pending files in the batch even an
empty file is rejected by the remote device. Also it provides appropriate
message to the user.
Change-Id: I0a48e1fb652c51b8e7eb8fa1c9a66efe99acd3d2
Bluetooth: OPP: Update the user confirmation with proper value
User confirmation for the Incoming Files is updated in the Array
from the Database. There are two Database reads, the first read
is used for evaluating the user confirmation and the second read
to update the information in the Local Array. The stored
information in the Array will be used to evaluate a change in
its value in the database. Because of this, if there is a change
in the database from the point of first read to second read, the
value stored in the array would be different than the value
evaluated. In this case the evaluation during next updateShare
call will not see any change in user confirmation value in database
and array and hence will not result in Notifying the ServerSession
which is waiting for user confirmation.
Change-Id: I382f9cccf63a8f53f46bb84639ab1345f784ad43
Bluetooth: Add send file information before retransmission
This patch adds send file information before retrying failed file transfer.
without this change, file outbound file could not be sent as file
information was missing resulting in error.
CRs-Fixed: 505101
Change-Id: I53e828672d107e80a600fbbcc73c7b0ec7bf0737
Bluetooth: OPP Update progress in worker thread
OPP throughput was seen very less because of the progress update
from BT Read/Write path. Moved it to worker thread.
Change-Id: I884356dc8b42a7f7eca1b8581e3118d5ec2ce9e2
Clean up file when file transfer is aborted by remote/local device
Delete File when the transfer is terminated due to
Remote's BT is turned off, remote being taken out of reach or
remote is turned off properly. Also delete the file on the next
reboot while the previous inbound transfer was interrupted by
local device power off.
CRs-Fixed: 506182
Change-Id: I96211e701610322881eda8345d04898ae3f18ab6
Bluetooth: set apk format as acceptable shareinbound types.
Adding apk format as a acceptable inbound types ,to be able
to receive these file formats from remote device.
Change-Id: I5175b634b88418b0d5c9baaedb84a48fe0d97357
CRs-fixed: 497427
OPP: Set ics format as acceptable shareinbound type
Adding ics format to acceptable inbound type, to be
able to receive these file format from remote device.
Change-Id: Ief9da2c745378ea28fa03da770aee3c8310892c4
CRs-fixed: 570922
OPP: Support for Obex Tx Rx at the same time
This change will allow the OPP Rx to be done even when
Tx is ongoing.
Change-Id: I87a048e8fdb1090bb755fe977901cc6325ce5415
CRs-fixed: 565447
Bluetooth-OPP: Separating Inbound and Outbound notifications
This change will ensure that inbound and outbound notifications will
be updated separately. Otherwise, during simultaneous Rx and Tx if
one of the ongoing transfer is aborted notification status will not
be updated and will show transfer in progress because there is one
active transfer.
CRs-Fixed: 601855, 609292, 653842
Change-Id: I907bd9706a747df82162ce3e5ce42eb40f8fc96f
Bluetooth-OPP: Truncate receiving file name instead of rejecting it
Truncate receiving filename if name exceeds OPP_LENGTH_OF_FILE_NAME
instead of rejecting file by the Obex server with response
OBEX_HTTP_INTERNAL_ERROR.
CRs-Fixed: 576621
Change-Id: I2ef5fbe22252f41a8c87958a2558476a310b7f39
Bluetooth-OPP: Cleanup OPP transfer sessions after abort
When user cancelled the tranfer while ongoing transfer,the transfer
session will be cleaned up properly. Otherwise, while Tx + Rx concurrency
if user abort the Tx and start Tx again new tranfer session will be created
only after Rx is finished.
CRs-Fixed: 585962
Change-Id: I9b5e1c0f1748ccc47811d669ddab96ba43f424f5
Bluetooth-OPP: Update notification while BT is turning OFF
Update notification while BT is turning OFF. Otherwise, if
notification thread didn't start when BT is turning OFF
inbound/outbound file transfer status notification will not properly
updated and show transfer in progress.
CRs-Fixed: 550485, 594171
Change-Id: I0752bcddcf218726c8564d26da7bc7c86a0005fd
Bluetooth-OPP: Handle Exceptions while OPP operation
Handle Exceptions while OPP operation. Otherwise, during transfer
if there is database or security error which will cause bluetooth
app crash.
CRs-Fixed: 568920
Change-Id: Id64facc10d08be7b7a60cd3b2b6a54e46f844777
Bluetooth-OPP: Cleaning up cursor object to avoid memory leak
Cursor objects are leaked after BT OFF/ON, when it is referenced
(Directly OR Indirectly). So Garbage Collector doesn't collect
cursor objects which are referenced. Setting NULL to cursor object
after closing to mark those variable as weak reference object.
Any objects memory is immediately claimed by GC, which are marked
as weak Reference.
CRs-Fixed: 579016
Change-Id: Ic019ae5bf6eb91fb25a259673216cd67fce4afe2
Bluetooth-OPP: Add pending state for multiple connection request
This change will ensure that multiple client connections are set to
pending when there already exist an OPP client connection. Otherwise,
some application can start OPP Server session without transfer and
if another client sends a file request during this time will cause
multiple incoming file request popup in DUT if first device trys to
send the file while DUT is already waiting for user confirmation for
the incoming file request from the second device.
CRs-Fixed: 659167
Change-Id: Iac6b3c160bd5be6a4ddcd31f8e82d1ee2528d0ec
Bluetooth-OPP: Fixed the BT occurs ANR when tap "try again" button
When tap the "try again" button on the send failed dialog, the
method "BluetoothOppSendFileInfo::generateFileInfo()" will be
call, if there are about 1500 contacts, execute this method
would be very time consuming, So caused the ANR happen.
Changed this method into the child thread execution, through
a Handler send a message to the main thread after this method
return, and then retry the failed transfer.
CRs-Fixed: 522213
Change-Id: I22bd04160e826789f8154bd334d948bb66ea1296
Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero
This change will avoid IndexOutOfBoundsException if number of sharing
files are zero. Otherwise, Bluetooth application will force close itself
when exception encountered.
CRs-Fixed: 628860
Change-Id: I42473c8ca2d9116c6d57707ab8f3c452d7027e67
Bluetooth-OPP: Add ogg format support
Add ogg format to acceptable share inbound types to send/receive
these file format using OPP.
CRs-Fixed: 623953
Change-Id: I0547a4aee11db294f1d58a61b0b2c68f62e3498c
Bluetooth-OPP: Clear incoming file notification while BT turned OFF
This change will ensure that incoming file notification will be cleared
from notification bar while BT is turned OFF. Otherwise, incoming file
notification will be displayed on notification bar even though BT is OFF.
CRs-Fixed: 610549
Change-Id: I11d6cc0360802862d836d082e2b16e139090dad0
Bluetooth-OPP: Cleanup pending share while BT turn OFF
This will ensure that pending OPP shares will be removed from database
while BT is turning OFF. Otherwise, BT turned back ON if there are some
pending share in database it will start sending automatically.
CRs-Fixed: 611970
Change-Id: Ibc2664840f11bfeaefb5984e8ac18a171d515129
Bluetooth-OPP: Avoid sending TRANSFER_COMPLETED_ACTION intent
This change ensure that TRANSFER_COMPLETED_ACTION intent will not
sent to receiver if there is any exception occurred during OPP
operation because this intent is already sent to receiver from message
handler. Otherwise, OPP toast message will come twice in UI.
So no need to sent it twice.
CRs-Fixed: 609287
Change-Id: I5fbd78d51102dad27145133cd867150f886cc997
Bluetooth: Fix the issue of certain files didn't send by bluetooth
DUT didn't send APK files or files whose format were not supported.
DUT didn't send several MP3 files by one time. These caused by the
bluetooth file transfer limit.
Add file type for bluetooth.
CRs-Fixed: 591288
Change-Id: Iaa7443dafa724a7c34597bd14bd160528a05fd06
Bluetooth: The hint display English when share a 0kb file in Chinese
Add the Chinese resource for "empty_file_notification_sent" string.
CRs-Fixed: 670792
Change-Id: I6e1db8b6a9abc672009a2d2d6d9bab11e7a5e822
Bluetooth:Invalid turning on BT under CMCC mode
In CMCC mode, share a picture through BT will turn on BT when airplane
mode is on. Return when airplane on and in CMCC mode when shareing
files through BT. Use res-overlay variable to control it.
CRs-Fixed: 655125
Change-Id: I4682d8eaf3c8faf990605f89b5f9b885df35e542
Bluetooth-OPP: Orientation change fix for tranfer history popup
Enable screen orientation support in Manifest file of Bluetooth app
for Bluetooth file tranfer history activity. Otherwise "Clear List"
popup will disappears soon after screen orientation changes.
CRs-Fixed: 584258
Change-Id: Ia6cfe1e6a48d37271fe6d558ea090fe39669410f
OPP: Use long as file size instead of int
This patch fixes issue of problems in sending/receiving files
which cannot be accomodated in int type of Java. Instead of using
int, long data type is used, which can hold 64 bits data size in JAVA
which is suitable for storing file sizes in GB. Changes are done
in how updates are sent to progress bar which supports only int
by using the percentage of data transferred to update the progress.
Change-Id: Ie545fd483c46dd7f41da56857e67decbe7f5a167
CRs-Fixed: 583275
OPP: Always try to get current name of device from stack
This patch tries to retrieve current name of device from BD stack
everytime, so as to avoid using cached device name which would lead
to wrong name when remote device name has been changed.
Change-Id: I0ae604b0cb7203dec79bdeeb6bd8d89793f29fa9
CRs-Fixed: 593828
Conflicts:
src/com/android/bluetooth/opp/BluetoothOppNotification.java
Conflicts:
res/values/strings.xml
Change-Id: I4682d8eaf3c8faf990605f89b5f9b885df35e542
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Android configchanges attribute is added to application manifest
so that activity will not close during orientation changes.
OPP cleanup api will be called in onDestroy instead of onPause.
Otherwise, if device went to suspend/display OFF during BTON activity
onPause is called and share file information is removed from hashmap
This will lead to transfer failure.
CRs-Fixed: 706665
Change-Id: I8c5f7a6e164e1efb1c14e964cce7910ead66e278
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If OPP transfer is failed because of connection failure, OPP
will call the transfer stop to cleanup the session and connectthread.
Since OPP is failed due to TRANSPORT_ERROR that will cleanup the connect
thread, but if TRANSPORT_ERROR is received during stop that will cause
Bluetooth application crash.
CRs-Fixed: 712216
Conflicts:
src/com/android/bluetooth/opp/BluetoothOppTransfer.java
Change-Id: I595e0105bf643946fbdc370db0c2cf951250d15f
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ANR is observed in OppLauncherActivity while sending 250 files
because OppLauncherActivity thread start DevicePickerActivity,
but in this case user clicked back key before PickerActivity starts
and then user tries to send 250 files again. At this point one of
the DevicePickerActivity got blocked.
CRs-Fixed: 710599
Change-Id: I3df3bc8559e91df6360fbc55d8e33d567184fe51
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
onContextMenuClosed API will be called when context menu is closed
and clear the menu instance. Otherwise, if instance is not cleared
properly next time user tries to open the menu again it will open.
CRs-Fixed: 703895
Change-Id: Icff15ad96eab23867f10b07064edef91584286ff
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
During concurrent inbound and outbound transfer batches if one of
them is finished, then should check for the pending batch to start
next batch. Otherwise, next batch will not start until last
running batch is finished.
CRs-Fixed: 703671
Change-Id: I126c7cba117b379f932d7fb2a3d467e72cf494b1
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Base reference for BluetoothOppL2capListener
is existing BluetoothOppRfcommListener.java.
Actual L2CAP socket implementation is added
from further gerrits.
CRs-Fixed: 639499
Change-Id: Ic2f9a4f5e91f55ee17333899a100c877f443c497
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- This patch handles closing of input stream if no device is selected
by user when trying to send file via BT. Without this patch, input
stream was never closed resulting in leak with each iteration and
system crash after 1024 iterations.
- This change will remove hashmap share entry if user selected share
via BT and press back or press cancel. Otherwise, hashmap will reach
its limit for successive share via BT and cause BT app to crash.
Change-Id: I6e145950975c3fe4cc5d1936c692e351779f242d
CRs-Fixed: 662147, 678607
Change-Id: I92aa0d8e81977fde0446f565f1de95e2d91e1e9c
|
| |
|
|
|
| |
Bug: 17334507
Change-Id: I36d3ef5575ad84a27cda415c1d0e262f097e98a7
|
| |
|
|
|
| |
Bug: 17128331
Change-Id: Ic1a4d9803790cc0f3e8003ede4da8cc8f26729cf
|
| |\
| |
| |
| |
| |
| |
| | |
is zero" into klp-wireless-dev
* commit '5693ce1fb60f7ebf858b4e35750a9335ebe47c72':
Bluetooth-OPP: Avoid IndexOutOfBoundsException if share is zero
|
| | |
| |
| |
| |
| |
| |
| |
| | |
This change will avoid IndexOutOfBoundsException if number of sharing
files are zero. Otherwise, Bluetooth application will force close itself
when exception encountered.
Change-Id: I42473c8ca2d9116c6d57707ab8f3c452d7027e67
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
This change will handle mouse right click event to display only
context menu with options Open and Clear. Otherwise, during HID mouse
right click two popup will be displayed context menu and Open option
while selecting context menu, option app crash is observed.
Change-Id: I8328f87f9c4bc007cd46a5567268621499e35343
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Change will add support to send same file multiple times. Otherwise,
if same file is selected to send multiple times after first transfer
succeeds queued instances of the same file got removed and it fails
to be sent.
Change-Id: Ic5b3706644a417cae2491d1df9588a22344f1711
|
| |\ \ |
|
