• Home
  • History
  • Annotate
  • only in /packages/apps/Bluetooth/src/com/android/bluetooth/opp/
History log of /packages/apps/Bluetooth/src/com/android/bluetooth/opp/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
0ac98162ff293fdaa23f93f9839aaad5428af537 18-Nov-2011 Chih-Chung Chang <chihchung@google.com> Read the requested file size completely.

This was causing failures while sharing pictures
from Picassa over Bluetooth.

Bug:5632161.

Change-Id: Ieb2697513299270b2982ebc6c9f0b367adf36d3a
luetoothOppObexClientSession.java
eb1192b4208d4bf77c92011822e6d171b9f09980 20-Sep-2011 Jaikumar Ganesh <jaikumar@google.com> Reject OBEX connection request for OPP with Target.

According to OPP OBEX specification Sec 5.4, the Push
client should not use target header.

Patch contributed by: inshik.shin@samsung.com

Change-Id: Iaeaa2d488da6592f8bb76a9957ca4b784d032803
luetoothOppObexServerSession.java
dec631a77ab9cc89c4d3867b80cfe300e7cf83e9 02-Sep-2011 Jake Hamby <jhamby@google.com> Use Notification.Builder.setProgress() for progress notifications.

- Convert OPP service to use the new API to create notifications
with a ProgressBar, replacing the previous custom layout.

Bug: 5143664
Change-Id: Iae5e2d417e735588e11c4d17e4172ca40b9dfe73
luetoothOppNotification.java
ef697b0b9a74e15b5003e134307e72b20b48de12 02-Aug-2011 jhtop.kim <jhtop.kim@samsung.com> Bluetooth : fix for the OPP service bug while BT on/off

Update patch set for removing BOOT_COMPLETED.

BluetoothOppService.java : use sendMSG instead of sendMSGdelayed
BluetoothOppReceiver.java : delete boot-complete line
AndroidManifest : delete boot-complete line

Change-Id: Icf9a2f48a70ba519cb3caf93a0b33e13472d1f54
Author: jhtop.kim <jhtop.kim@samsung.com>
luetoothOppReceiver.java
luetoothOppService.java
66cbd62c4837f1e9a261fb1bde1d470c904f2346 04-Aug-2011 jhtop.kim <jhtop.kim@samsung.com> Bluetooth :fix opp for socket error retry

When the pin or link key missing case occurs,
we need to retry the socket connection. Use a timeout
of 1.5 secs instead of 2.5 secs because the ACL inactivity
timer is 2 secs.

Change-Id: I3d4c096bd823e3204e91040bea608e44471dd4ce
luetoothOppTransfer.java
6861c09108700815891920147247f2cf48261ee4 02-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Check if BT is already enabled before starting activity.

If BT is off, and if the user sends a file, BT will be turned on
and the "Enabling dialog" wil be shown. But with the hot feature,
BT turns on very fast which leads to the intent being missed and the
enabling dialog not being dismissed.

Change-Id: I4f4a6f08e04922a61eb7138b76383a77f8d37da4
luetoothOppBtEnablingActivity.java
b0b662a98d8b7c099ee706d0e08bd239adcdffc7 27-Jul-2011 Jaikumar Ganesh <jaikumar@google.com> Fix notification issues with OPP.

Since its a notification event for an ongoing event, add the flag.
That prevents it from being scrollable.

Change-Id: Iaea2e7005cb4f8ab5d0b594c4ef9b30343b730fc
luetoothOppNotification.java
44c347ad717ca51b00819736227f7a9c81905396 15-Jun-2011 Liejun Tao <L.J.Tao@motorola.com> Modify the Rfcomm retry logic

In BluetoothOppTransfer where we check mRetry and e.getMessage()
if mRetry is false and e is not "Invalid exchange", the transfer is stuck

Change-Id: Ie7a4da215c9e74e167db9fa29c6e113a7a7a2c77
luetoothOppTransfer.java
9d67ffdac68b49cfc72491f7e2c340df922dbcca 07-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> am c50dbb00: Merge "OPP: Notification position is changing"

* commit 'c50dbb0067de1772ced124f5982a59468ad81426':
OPP: Notification position is changing
6874774ab6b2fe5d90896be756d26a9887e4124b 07-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> am e7df5087: Merge "Handle OBEX Abort packets sent from remote device"

* commit 'e7df508750728dc2bbd7729d54673bf16f7688c3':
Handle OBEX Abort packets sent from remote device
c50dbb0067de1772ced124f5982a59468ad81426 01-Jun-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "OPP: Notification position is changing"
9abe9c9e1ccad600b1069490293d78dfd984017b 22-Feb-2011 Andreas Areskoug <andreas.areskoug@stericsson.com> Handle OBEX Abort packets sent from remote device

This patch adds support for handling OBEX Abort packets
sent from remote device, where the remote device is acting
as a client, sending files to the server.

Depends-On: I0fc2255c463c5ce1e8fa1d7febf144b60965a1be

Change-Id: I4bce05a9007ba02e9d9987ec3cbbf1db380247f0
Signed-off-by: christian bejram <christian.bejram@stericsson.com>
luetoothOppObexServerSession.java
74e5eba4a45ecca87eec3ac1762ca527cc614d78 12-Apr-2011 erik.ljungberg <erik.ljungberg@sonyericsson.com> OPP: Notification position is changing

If several transfers is ongoing the Bluetooth transfer notification
is changing position. The reason for this is that the when field is
not set in the notification. Solved by setting when.

Change-Id: If999fae6dd2d6b5de38c3bfeba786ad2df9da48f
luetoothOppNotification.java
929d38f9226a00941571804a490e76eb4c6eef10 14-Apr-2011 Jaikumar Ganesh <jaikumarg@android.com> am 3c68bca8: am 138654ff: Merge "The phone did not reject unsupported vCalendar item"

* commit '3c68bca80f40710b70e3f9173cea167b30a8dcb4':
The phone did not reject unsupported vCalendar item
76d17f9aff4a4aaad0f5af91eee1028473c10b16 06-Dec-2010 Olsson <ola1.olsson@sonyericsson.com> The phone did not reject unsupported vCalendar item

vCalendar is not supported in the phone but it was not
rejected. A blacklist was present in the code but not
used. Hence, this fix enables the blacklist functionality.

Change-Id: I4fefe0e819eb025d37c972cf7e74eabd4f6e6585
luetoothOppObexServerSession.java
59199b744c6f107afaac8ec9347d1c04ca6b2ab8 30-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> am a4f55f77: am c298d29b: Merge "Add check for null pointer to avoid crash."

* commit 'a4f55f7702bca57c0dbb543ee3e2cb1686e616fc':
Add check for null pointer to avoid crash.
c298d29b081e4240c80750e9431b7189d0b38513 30-Mar-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Add check for null pointer to avoid crash."
98a53e5bdb2500109c304f2b5364c1715ab745d8 06-Dec-2010 martin ma <martin.ma@sonyericsson.com> Add check for null pointer to avoid crash.

This is added in order to prevent a crash. Also, updating the name
of a device to null, making it appear as 'Unknown', is probably not
intended.

Change-Id: Ibd3c93741489aae9118ba7b45223d58d5de6812f
luetoothOppPreference.java
d6a1c1c4bf3da920582e17c8c6e32c7ef74a555f 08-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Retry rfcomm socket connections after link key exchange error.

If the devices were paired before, but unpaired on the
remote end, it will return an error (when sending a file)for the auth
request for the socket connection. Link keys will get exchanged
but we need to retry the socket connection. There is no good way to
inform this socket asking it to retry apart from
a delayed retry. The socket is opened at the kernel level
but the link key retrys happen at the Bluez userspace level.

Note: This is a temporary change, once the new mgmt interface comes
up in Bluez, we wouldn't need this.

Change-Id: Ifbd93d7f69b93515dda6c6f4ad2796853f9d5841
luetoothOppTransfer.java
a85ff0a96f7d5f64bf1e9ca99789cb8dc69f6d97 05-Jan-2011 Kevin LeBlanc <kevin.leblanc@sonyericsson.com> Check if BT is allowed in airplane mode

Currenty, the bluetooth sharing activity always quits with an error
message if airplane mode is on. Instead, the activity should check
if bluetooth may be enabled in airplane mode, given the current
system settings.

Change-Id: If9272a941504054d7819e0248f93a8b5bca8d41e
luetoothOppLauncherActivity.java
1ed96d522298e8f48690a4f4cbf2e0c6b402e3a0 26-Jan-2011 Jake Hamby <jhamby@google.com> Implement "show received files" intent for Settings.

Add a handler for a new intent (sent from the Settings app) to
show all files received via Bluetooth. This is equivalent to the
now deprecated live folder view of received files.

Bug: 3167219
Change-Id: Ibb8d3738d62301af5b012489a69ac078e554b66d
luetoothOppReceiver.java
luetoothOppTransferHistory.java
onstants.java
c83ffa5289995a4071b5d84055da07e2c72de2d9 05-Jan-2011 Kevin LeBlanc <kevin.leblanc@sonyericsson.com> Check if BT is allowed in airplane mode

Currenty, the bluetooth sharing activity always quits with an error
message if airplane mode is on. Instead, the activity should check
if bluetooth may be enabled in airplane mode, given the current
system settings.

Change-Id: If9272a941504054d7819e0248f93a8b5bca8d41e
luetoothOppLauncherActivity.java
3500d1cc714807945b1427e43eb3bde367849e43 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "BT - Not possible to accept incoming obex transfers using key-presses."
5e9a02df66c6044bd4a06b9d53e6cdbd8ad22606 28-Sep-2010 Edward Savage-Jones <edward.savage-jones@sonyericsson.com> Sanitise Bluetooth file name hint when receiving a contact

If a contact name is entered with any of the following characters

:"<>*?|\n\t

the transfer of that contact fails. This is due to the underlying
filesystem (FAT) not being able to handle these characters in a
file name. This fix corrects that situation by replacing any
whitespace characters with a space and illegal FAT filesystem
characters with underscore.

Change-Id: I5021bd26a16c31810a61bac3f70439c1153451c2
luetoothOppReceiveFileInfo.java
e7f887dab2591a46ecf80616e00f33bb5d847935 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 55936599 to stage-korg-master

Change-Id: I5f04a3ae2f0246853f16b0fdb209e67df95e6ca8
a930b6831d0c70b6c5d34e548e6b1dceaa6529a0 01-Nov-2010 Mohammad Shamsi <m.h.shams@gmail.com> code cleanup.
unused imports, local variabls and static constans removed from
com.android.bluetooth.opp package.

Change-Id: I0fd682a190221e216fac71723c05d3828b9fa42d
luetoothOppBatch.java
luetoothOppManager.java
luetoothOppNotification.java
luetoothOppPreference.java
luetoothOppReceiver.java
luetoothOppRfcommListener.java
luetoothOppSendFileInfo.java
luetoothOppService.java
luetoothOppTransfer.java
luetoothOppTransferActivity.java
luetoothOppTransferHistory.java
estActivity.java
4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2 12-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Fix OPP crash and Call Log sort order.

Bug: 3067780 3067770
Dr No: jerry

Change-Id: I2ac39e2f1f0233a6ada84af39d8addfe0fe04cea
luetoothOppObexServerSession.java
5f78d4ef75710e3dbf608644b16da7c6f88d00ed 29-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Update BT folder icon." into gingerbread
5b09b7148807c3f864da0a671141f2a2379445b2 29-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Update BT folder icon.

Change-Id: I1aecca20d4a9aaaf8e4aad37eb5c2e2357fad6ad
luetoothOppLiveFolder.java
0a79bdbbfa3b79b808cbbe7490731e5aae4489e9 28-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Trim the Bluetooth database off the main thread.

This looks to be most if not all of the remaining StrictMode
violations in this process. Not a huge deal, but cleaning up noise
will make bigger problems stand out easier in the future.

Change-Id: I262194c12114114fbe059d73475afb1bbb5654ab
luetoothOppService.java
453050fdaf7dcd488f399d3549ce257e7b9e7e79 17-May-2010 Wojciech Jowsa <wojciech.jowsa@stericsson.com> BT - Not possible to accept incoming obex transfers using key-presses.

It is not possible to accept/reject an incoming obex file transfer
using key-press. Only touch screen press was working.

With this fix, key press down is not ignored and it is possible
to accept/reject an incoming obex file transfer with key-press.

ST-Ericsson Change ID: ER260817
Change-Id: Ic7f668bd1b0efa549d0218edc8719efee1984941

Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
luetoothOppIncomingFileConfirmActivity.java
55470710c2624bde2aa56275d29b60055638c06c 03-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Replace use of SharedPreference commit() with apply().

Also fix a typo and replace a bunch of redundant
SharedPreference.Editor commits with one at the end.

Change-Id: I75623cb6809a363d05421f80f1560d586ae1ab80
luetoothOppManager.java
luetoothOppPreference.java
eb77c4b1d9aa71d7dd8dd934e9d1971583f9c0e2 03-Aug-2010 Liejun Tao <L.J.Tao@motorola.com> Optimize Opp Notification

Current Opp notification is running too frequently. When file transfer
speed is fast, it could update notification 7-8 times in 1 second.
Use a timer to limit the notification to once per second.

Change-Id: I162033d9e12148260515c8ed318928e4de9a4392
luetoothOppNotification.java
luetoothOppService.java
luetoothOppTransferHistory.java
1d2222642c372e5635a906b6d6620ac35a304cf9 16-Apr-2010 Lixin Yue <L.X.YUE@motorola.com> Fix the %1 bug in UI when sdcard full
luetoothOppTransferActivity.java
luetoothOppTransferAdapter.java
luetoothOppUtility.java
ec6f2d44491bf1e3ffa7c75875985f9c16cf721d 26-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Clear notifications when the user presses clear from the notifications bar.

Bug: 2542260
Change-Id: I00f9d8216d70543b93cfbcdb2cd8da8331044d77
luetoothOppNotification.java
luetoothOppReceiver.java
onstants.java
0bd5f7b5c36a60687ffe895368fd8df6df38acab 24-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Fix pbap and opp running bluetooth in phone process problems.

1. Use the right context instead of application context.
2. Make PbapActivity run in the same process as PbapService as they
share state.

Change-Id: Ib50c63c271dd8b30108f22734c47ee8645cd4839
luetoothOppManager.java
luetoothOppPreference.java
2cd80b69baa6c96f1ab759fb45cd98e2cbc5f845 18-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Enhanced support to OPP content share"
151f41949621e082e127fe468bedd28289bc3a19 12-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Enhanced support to OPP content share

Add support to Browser link share via BT;
Add support to share files via BT in 3rd party file manager;

Change-Id: I9a93eb0891d0f670109afd44ab4064f7f15b01f3
luetoothOppLauncherActivity.java
luetoothOppSendFileInfo.java
60c43926b63509fa0607fc671e6fd91106d4a827 17-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Update notification in Transfer history manually when BT if off"
75fc857d22de0ec22e082bddb720d8465c9e3552 12-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> optimize deleting operation in trimDatabase()
luetoothOppService.java
de773e60fed15a4ad13325089a5609c9bc6ede59 15-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Update notification in Transfer history manually when BT if off
luetoothOppNotification.java
luetoothOppTransferHistory.java
df25af65a20d30b18b4715d47ca6c0b2557116ad 10-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Trim Opp database when service restarts."
389f6dd45f7a45b12af847a510086125777e1198 03-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Trim Opp database when service restarts.

When Opp service restart, we will trim the database.
a) No visible case is deleted.
b) Invisible complete outbound (failed and successful) are deleted.
c) Invisible complete failed inbound are deleted.
d) Invisible complete success inbound are deleted if needed to keep records max
to 1000.

Live folder only has received files, so the above makes sense.

Change-Id: If27080721d9abed025162ff805f661fde01564d3
luetoothOppService.java
onstants.java
20844c451b1a82d683b3dd6169b00b03373f6531 10-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Not update TransferActivity button during activity creating."
0e927e914b80baf2d37439f8b99134cfe274a1d5 08-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Not update TransferActivity button during activity creating.

This is to fix below issue: when an ongoing transfer is almost to complete,
click the ongoing notification to launch TransferActivity, there will be
possible crash due to NullPointerException.
Root casue is: when TransferActivity onCreate() is called, the transfer is
still ongoing, so mIsComplete is false; but when onCreate() call to
updateProgressbar(), the transfer may change to complete, and then updateButton()
will be called; In updateButton(), mAlert (which will be initialized in father
class AlertActivity) still not intialized, which caused NullPointerException.

Change-Id: Ibfe363f3822386a38b9b108e29f60ad6673f70f6
luetoothOppTransferActivity.java
509a6cd43906cce5f9bc78a83bd2058a4e5249e7 05-Mar-2010 Lixin Yue <L.X.YUE@motorola.com> Remove the number above status icon for Opp transfers
luetoothOppNotification.java
5cc617943765df27844e459362c4bc1821305216 26-Feb-2010 Lixin Yue <L.X.YUE@motorola.com> Add opp Transfer history to avoid cluster of notificatoins To reduce the cluster of Opp nofications, we introduce the concept of Opp transfer history. Only 2 notifications exist for finished opp transfers, one is for outbound transfers, and another is for inbound transfers. User can see all detailed items in corresponding screen when click the notification.

Change-Id: Iffed353ea6b0d7c958c71fe8d3996937058ced30
luetoothOppNotification.java
luetoothOppReceiver.java
luetoothOppTransferAdapter.java
luetoothOppTransferHistory.java
onstants.java
c6f1bacf1d4c39d7efd5dc98004d936c18ed51f1 23-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> Move insert share info operation to a thread to avoid Receiver timeout

In OppReceiver, the function mOppManager.startTransfer(remoteDevice), which
is used to insert share records to DB, can be really a time-consuming
operation in case of 300 or more objects sharing case.
For onReceive() function in BroadcastReceiver, there are below specification:
The function is normally called within the main thread of its process, so you should never
perform long-running operations in it (there is a timeout of 10 seconds that the system allows
before considering the receiver to be blocked and a candidate to be killed)

Add handle to concurrent sending case
In Gellary, user can multiple select files (say 50files), and share via bluetooth to device1,
and then right away share via bluetooth to device2, and also can share to device3. In such
extream case, we need ensure all share info are saved to db.

Complete the TODO in OppManager
Store application data to SharedPreferences and restore them when service restart.
luetoothOppLauncherActivity.java
luetoothOppManager.java
luetoothOppNotification.java
luetoothOppReceiver.java
1f0fc26568c1babf0c66d2c75812b72e894eb0de 16-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> Fix non-existing received file still appearing in live folder issue

After receiving a file by OPP from Bluetooth remote device, user can delete
this file from Gallery or 3rd party application. In Opp live folder, user
could still open this file, but with dialog "file not exist" displayed, and
there is no way to make this file disappear from liver folder.
Current solution is to delete the BT OPP DB record after openning an invalid
uri associated with the file in folder, as an easy method without syncing.
luetoothOppReceiver.java
luetoothOppTransferActivity.java
luetoothOppUtility.java
a4508589f298c67fda54c344760ae39f0f375c11 10-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> Update the error codes to be compatible with PBAP spec.

Catch IndexOutOfBoundsException and NullPointerException in Opp sendFile().
luetoothOppObexClientSession.java
6ef730f85e90a8246d06c7a58bb21eee5074945c 17-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> Enable vcard share in OPP

Bluetooth OPP to handle x-vcard MIME type from contacts share
Handle vcard size by content type instead of tightening with contacts
luetoothOppSendFileInfo.java
onstants.java
6414394c20cd885f5bd4561e06bbecac9c93cfb1 02-Dec-2009 Lixin Yue <L.X.YUE@motorola.com> am 6ee2d0e0: Fix Opp notifications timestamp not correct issue

Merge commit '6ee2d0e0405a074cf827e0c0ac4bfbffd1850cea' into eclair-mr2

* commit '6ee2d0e0405a074cf827e0c0ac4bfbffd1850cea':
Fix Opp notifications timestamp not correct issue
019188fd686dbe7a9610255ea8aa61bd589a6bd1 30-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ifb8562d3 into eclair-mr2

* changes:
Add a few specific file type support
6ee2d0e0405a074cf827e0c0ac4bfbffd1850cea 02-Nov-2009 Lixin Yue <L.X.YUE@motorola.com> Fix Opp notifications timestamp not correct issue

Should set the value of Notification.when before calling
setLatestEventInfo()

Dr No:Eastham
Bug: 2292381
luetoothOppNotification.java
fb8562d35d3b7d2fc60e1bb01a9c15cfe9824a94 18-Nov-2009 Tao Liejun <a19884@motorola.com> Add a few specific file type support

Support to receive and send a few specific file types
.xls, .zip, .doc, .ppt, .pdf
onstants.java
03f598bafa0fc0cbde0c5ab8fed89e07a67d482e 25-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> Catch all exceptions while trying to send a file.

While trying to share pictures, some applications might
not have given the adequate permissions.

DrNo:Jsh
Bug:2284822
luetoothOppService.java
b506e52fabbc02445f3652049ed8a390d4fcaa7f 09-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I428bc0fc into eclair

* changes:
Remove STOPSHIP BT logging.
0e6233ffba67e757f60171803d7ab376cf73c16c 09-Oct-2009 Nick Pelly <npelly@google.com> Remove STOPSHIP BT logging.

Do not merge.

Change-Id: I428bc0fc67030f24112f2e9c865824dfaea4897d
DrNo: eastham
Bug: 2089423
Joke: Why does E.T. have such big eyes? Because he saw his phone bill.
onstants.java
59256dee3f9787fd660c346d61e0271ecd4bfe9a 08-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> Update PBAP code for Contacts database changes and check for OPP
file extension.

Original Author for PBAP - Yue Lixin
Dr No: Eastham
Bug: 2174759
luetoothOppObexServerSession.java
luetoothOppReceiveFileInfo.java
3a88b20fcd71e42451e402d27374b19eeb2ff0da 08-Oct-2009 Nick Pelly <npelly@google.com> Update application code for BluetoothAdapter.getDefaultAdapter().

Change-Id: I7baafb909b74783da4e51d48f2465e7aacf07eb5
DrNo: eastham
Bug: 2158765
Joke: What goes 99-thump, 99-thump? A centipede with a wooden leg.
luetoothOppBatch.java
luetoothOppManager.java
luetoothOppService.java
luetoothOppTransfer.java
luetoothOppTransferActivity.java
luetoothOppUtility.java
e42f4c90d20e3192c18bbe8fad98059b0c910cd7 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I8222c790 into eclair

* changes:
Update OPP/PBAP service to use onStartCommand() Adjust function call seqence in PBAP closeService
8222c7902a2281929fd31e840f6012038e6fa44a 29-Sep-2009 Lixin Yue <L.X.YUE@motorola.com> Update OPP/PBAP service to use onStartCommand()
Adjust function call seqence in PBAP closeService
luetoothOppService.java
b0fa09caef6a0748a568dc2a89f5d94b85423bb2 29-Sep-2009 Lixin Yue <L.X.YUE@motorola.com> Update OPP/PBAP UI

Add timeout handling to incoming file confirm dialog, to avoid uncertain
behavior when timeout happen
Fix PBAP request timeout issue when open/close slider, dismiss timeout
dialog to avoid uncertain behavior
Fix typo in strings
luetoothOppIncomingFileConfirmActivity.java
luetoothOppTransfer.java
luetoothShare.java
668a8d617ac827770a484ad6b3f329ee248745ee 28-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ifb946935 into eclair

* changes:
Added WhiteList of acceptable MIME types for OBEX transfers. Part of OBEX/OPP security review. Bug information: http://b/issue?id=1972237
fb946935fe50d957e835ac00a592bd3d222edef3 28-Sep-2009 Oscar Montemayor <oam@android.com> Added WhiteList of acceptable MIME types for OBEX transfers. Part of OBEX/OPP security review.
Bug information: http://b/issue?id=1972237
luetoothOppObexServerSession.java
onstants.java
202e9f669d8972d6371c349ed65f311de465be1a 28-Sep-2009 Nick Pelly <npelly@google.com> Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid

Change-Id: Ia0eb46d9bdff6a8ab3333bb0ad1f66d0303c135a
luetoothOppTransfer.java
6fbad3dd950238d871c4efce4eb258ae1a54b878 27-Sep-2009 Oscar Montemayor <oam@android.com> Proposed file canonical path prevetion for directory trasvesal attacks. Fix suggested by meder@google.com.
More fixes form CR comments.
luetoothOppReceiveFileInfo.java
9d9e511fe7425fb3105ece227ecedb43d6333333 21-Sep-2009 Tao Liejun <L.J.Tao@motorola.com> Use new SDP API for OPP

Use new API BluetoothDevice.fetchUuidsWithSdp() to query SDP for un-paired device, and request SDP
update when Opp is not in cache.
Handle a concurrent case when incoming connection and file share happens together
Some other minor changes

Change-Id: I7ebf34801518867553551d8f7bba7ac62e22667e
luetoothOppLauncherActivity.java
luetoothOppObexServerSession.java
luetoothOppReceiveFileInfo.java
luetoothOppReceiver.java
luetoothOppRfcommListener.java
luetoothOppService.java
luetoothOppShareInfo.java
luetoothOppTransfer.java
onstants.java
c4b72ebe2ed9cd29c40a75411702ca9dca9424ac 24-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26736 into eclair

* changes:
Update opp/pbap look and feel
38416553a26e55963e11276f1029d78e9e6cad70 23-Sep-2009 Rich Cannings <richc@google.com> Fixes NullPointerException that crashes Bluetooth when filename ends end with slash, e.g.: 'fooo..txt/'.

choosefilename() can return null. We should handle this result and grecefully fail.
luetoothOppReceiveFileInfo.java
dc3bacd6eb626a93f2c3c4c62b3ef6aa9e575d92 21-Sep-2009 Lixin Yue <L.X.YUE@motorola.com> Update opp/pbap look and feel

Update OPP BtEnabling Dialog-add timeout handling, handle Bluetooth ON intent, handle back key

Change-Id: I3d3ade3a9a4de645ddb7195e8b81ca42afb3d31e
luetoothOppBtEnableActivity.java
luetoothOppBtEnablingActivity.java
luetoothOppIncomingFileConfirmActivity.java
luetoothOppNotification.java
luetoothOppTransferActivity.java
1f556d99c4bb7cae5ed55c171ce7f65b5010fa57 22-Sep-2009 Oscar Montemayor <oam@android.com> Replaced back-slashes on hint path URI with forward-slahes, more in line with Linux FS conventions.
Code review changes incorporated patch set 3 rev.
luetoothOppReceiveFileInfo.java
68ea2a43de2e7cee20c03332ed9f5ff004e42884 02-Sep-2009 Jaikumar Ganesh <jaikumar@google.com> Change handling of remoteUuids.
luetoothOppTransfer.java
f2c447b81c6c03cb1c8a3e64a10381e23934834a 10-Sep-2009 Nick Pelly <npelly@google.com> Update application for Bluetooth API changes.

Change-Id: I618553f2aa4e8705e3dff1247752e5fc357ef94d
luetoothOppLauncherActivity.java
luetoothOppReceiver.java
luetoothOppService.java
613bae227d65f61903e196944a9c718b4394f25a 09-Sep-2009 Nick Pelly <npelly@google.com> Update application for Bluetooth API change: deprecation of BluetoothError.
luetoothOppReceiver.java
luetoothOppService.java
f4a286ee2aba5a75abe41881334bbdb5d0080105 09-Sep-2009 Nick Pelly <npelly@google.com> Update application for Bluetooth API change.
luetoothOppReceiver.java
luetoothOppService.java
fa5d402906010cd17c8ed7de0dbcbfdcb78dab20 01-Sep-2009 Nick Pelly <npelly@google.com> Workaround bug in Poloroid Pogo.

Rename extra dots to underscores.

Working with Poloroid to get an updated list of affected MAC addresses. For now
we just have 00:04:48.
luetoothOppObexClientSession.java
luetoothOppSendFileInfo.java
luetoothOppTransfer.java
888485a3f5fe991116c5536bb6d6903d47b63a70 31-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> Cleanup Opp debug code

Stop Rfcomm polling
Delete a few unused functions
luetoothOppBatch.java
luetoothOppPreference.java
luetoothOppRfcommListener.java
luetoothOppService.java
luetoothOppTransfer.java
luetoothOppUtility.java
onstants.java
estActivity.java
estTcpListener.java
estTcpServer.java
estTcpSessionNotifier.java
estTcpTransport.java
32e47df203390052c1ef771d78b22fc4aa5f9e72 27-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> Simplify wakelock release for Obex Server
luetoothOppObexServerSession.java
ce4d93666275df294cb073fe41de5b85932570a8 28-Aug-2009 Nick Pelly <npelly@google.com> Clean up Logging.

Use the pattern if (V) Log.v(...); for logging. The Android style prefers curly braces, but for log lines it is ok to use a one-liner to keep the code manageable.

Remove spaces from some log tags, and rename TAG BluetoothShareProvider to BluetoothOpp.

Rename LOGVV to V, and LOGV to D.

Just before ship we will change Constants.DEBUG and Constants.VERBOSE to false to compile out all the logging code.
luetoothOppBatch.java
luetoothOppBtEnableActivity.java
luetoothOppBtEnablingActivity.java
luetoothOppBtErrorActivity.java
luetoothOppIncomingFileConfirmActivity.java
luetoothOppLauncherActivity.java
luetoothOppManager.java
luetoothOppNotification.java
luetoothOppObexClientSession.java
luetoothOppObexServerSession.java
luetoothOppPreference.java
luetoothOppProvider.java
luetoothOppReceiveFileInfo.java
luetoothOppReceiver.java
luetoothOppRfcommListener.java
luetoothOppService.java
luetoothOppTransfer.java
luetoothOppTransferActivity.java
luetoothOppUtility.java
onstants.java
estTcpListener.java
estTcpServer.java
d6641e4a7bb22833e1c07cb3af7989835fa7e16d 19-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> Remove Device picker
luetoothDevicePickerActivity.java
luetoothDevicePickerBtStatus.java
luetoothDevicePickerDevice.java
luetoothDevicePickerDeviceManager.java
luetoothDevicePickerDevicePreference.java
luetoothDevicePickerListener.java
luetoothDevicePickerManager.java
luetoothOppLauncherActivity.java
luetoothOppReceiver.java
luetoothPinDialog.java
luetoothShare.java
rogressCategory.java
1ac5507790a87810061a19dadec36eb328a222ea 07-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> OPP update

Rewrite provider permission to allow LiveFolders work
Support file:// uri to share file
Support multiple share from gallery
Fully support sending file queue
Hold incoming connection for a while when OPP is busy instead of reject directly
Move notification update to a thread
Handle many error cases to display correct error messages
Improve server/client timeout
Delete empty file after reject incoming file
Support upper case incoming file extension
Avoid multiple mediascanner connections
luetoothOppLauncherActivity.java
luetoothOppManager.java
luetoothOppNotification.java
luetoothOppObexClientSession.java
luetoothOppObexServerSession.java
luetoothOppProvider.java
luetoothOppRfcommListener.java
luetoothOppSendFileInfo.java
luetoothOppService.java
luetoothOppTransfer.java
onstants.java
41ef8d494511c040451f2f887cb31c3100746b61 07-Aug-2009 Nick Pelly <npelly@google.com> Bluetooth: Update Bluetooth.apk to match BT API change.

Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).
luetoothDevicePickerActivity.java
luetoothDevicePickerDevice.java
luetoothDevicePickerDeviceManager.java
luetoothDevicePickerListener.java
luetoothDevicePickerManager.java
luetoothOppBatch.java
luetoothOppManager.java
luetoothOppPreference.java
luetoothOppReceiver.java
luetoothOppRfcommListener.java
luetoothOppRfcommTransport.java
luetoothOppService.java
luetoothOppShareInfo.java
luetoothOppTransfer.java
luetoothOppTransferActivity.java
luetoothOppUtility.java
luetoothPinDialog.java
464d9d216ab1a6cf192e3e526596073c7e35e4a7 13-Aug-2009 L.X.YUE <L.X.YUE@motorola.com> Update Opp icons

Update incomming file notification icon to be consistent with system;
Update OPP launcher icon per Anroid guidline;
luetoothOppIncomingFileConfirmActivity.java
luetoothOppNotification.java
52236de777c23788df8147de15912a57e8bc36dd 04-Aug-2009 Tao Liejun <L.J.Tao@motorola.com> Fix a few OPP issues

Grab wakelock for server session
Fix send small file bug
luetoothOppObexClientSession.java
luetoothOppObexServerSession.java
luetoothOppReceiver.java
luetoothOppRfcommListener.java
luetoothOppService.java
luetoothOppTransfer.java
onstants.java
239bc526513429995c61c4148c105725c395b1a9 27-Jul-2009 Jackson Fan <xyfan@motorola.com> Enable Opp Livefolder, modify localizable resource

Update on patchset 2
Update icon for Bluetooth share and Incoming file
Fix minor Opp UI issue
Update log print for mimetype got from android system.
Update return response code for un-supported media type
Patchset 1
remove the use of replace() of localizable resource
Enable Opp Livefolder by using local certificate
Reject vcard actively
luetoothOppIncomingFileConfirmActivity.java
luetoothOppLiveFolder.java
luetoothOppNotification.java
luetoothOppObexServerSession.java
luetoothOppProvider.java
luetoothOppReceiver.java
luetoothOppTransferActivity.java
onstants.java
87f9a72cc2d9544f65eab18893f7dc0de4f6ee31 23-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Disable verbose logging.

TODO: We need to fix logging according to new verbose logging in OPP and PBAP.
luetoothOppRfcommListener.java
onstants.java
eb37b3c2c9d59bc1c0f09f911f5bde077a63f4da 18-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Rename cancelPin to cancelPairingUserInput for Bluetooth 2.1
luetoothPinDialog.java
af9af3c451fde7712e86c9430169c306b91836a4 15-Jul-2009 Jackson Fan <xyfan@motorola.com> Cleanup resources of OPP

Modify according to Ranian's comments
- adjust layout
- remove Capitalized resource names
- format
estActivity.java
df7415da0e510ab8e4b73831a5ade38306982fe1 16-Jul-2009 Tao Liejun <L.J.Tao@motorola.com> Fix OPP receive bug

Fix the bug that second receving would fail
Show display name instead of full name in notification
luetoothOppNotification.java
luetoothOppObexServerSession.java
luetoothOppService.java
luetoothOppTransfer.java
6769b59d715ea98bd72eafcfea9acd2714a887da 15-Jul-2009 Tao Liejun <L.J.Tao@motorola.com> Make opp compile

Modify to make opp application compliable in new git
-change package name
-change manifest
-modify a few comments
luetoothDevicePickerActivity.java
luetoothDevicePickerBtStatus.java
luetoothDevicePickerDevice.java
luetoothDevicePickerDeviceManager.java
luetoothDevicePickerDevicePreference.java
luetoothDevicePickerManager.java
luetoothOppBatch.java
luetoothOppBtEnableActivity.java
luetoothOppBtEnablingActivity.java
luetoothOppBtErrorActivity.java
luetoothOppIncomingFileConfirmActivity.java
luetoothOppLauncherActivity.java
luetoothOppLiveFolder.java
luetoothOppManager.java
luetoothOppNotification.java
luetoothOppObexClientSession.java
luetoothOppObexServerSession.java
luetoothOppPreference.java
luetoothOppProvider.java
luetoothOppReceiveFileInfo.java
luetoothOppReceiver.java
luetoothOppRfcommListener.java
luetoothOppSendFileInfo.java
luetoothOppService.java
luetoothOppShareInfo.java
luetoothOppTransfer.java
luetoothOppTransferActivity.java
luetoothOppUtility.java
luetoothPinDialog.java
luetoothShare.java
onstants.java
rogressCategory.java
estActivity.java
estTcpListener.java
estTcpServer.java
estTcpSessionNotifier.java
09e9cba205af60b3f42e7a4d891a7d1392e1f2a5 11-Jul-2009 Nick Pelly <npelly@google.com> Initial drop of Motorola Bluetooth OPP code.

Minor changes from Moto code:
- Added Motorola BSD license
- Moved com.motorola.bluetoothshare to com.android.bluetooth.opp
- Updated com.motorola.obex to javax.obex
- Moved Android.mk to Android.mk.hide: does not yet compile due to changes in
Obex library.
luetoothDevicePickerActivity.java
luetoothDevicePickerBtStatus.java
luetoothDevicePickerDevice.java
luetoothDevicePickerDeviceManager.java
luetoothDevicePickerDevicePreference.java
luetoothDevicePickerListener.java
luetoothDevicePickerManager.java
luetoothOppBatch.java
luetoothOppBtEnableActivity.java
luetoothOppBtEnablingActivity.java
luetoothOppBtErrorActivity.java
luetoothOppIncomingFileConfirmActivity.java
luetoothOppLauncherActivity.java
luetoothOppLiveFolder.java
luetoothOppManager.java
luetoothOppNotification.java
luetoothOppObexClientSession.java
luetoothOppObexServerSession.java
luetoothOppObexSession.java
luetoothOppPreference.java
luetoothOppProvider.java
luetoothOppReceiveFileInfo.java
luetoothOppReceiver.java
luetoothOppRfcommListener.java
luetoothOppRfcommTransport.java
luetoothOppSendFileInfo.java
luetoothOppService.java
luetoothOppShareInfo.java
luetoothOppTransfer.java
luetoothOppTransferActivity.java
luetoothOppTransferInfo.java
luetoothOppUtility.java
luetoothPinDialog.java
luetoothShare.java
onstants.java
rogressCategory.java
estActivity.java
estTcpListener.java
estTcpServer.java
estTcpSessionNotifier.java
estTcpTransport.java