OSDN Git Service
Eric Fischer [Thu, 7 Jan 2010 23:56:15 +0000 (15:56 -0800)]
Update with latest translations.
Jean-Baptiste Queru [Wed, 6 Jan 2010 00:27:20 +0000 (16:27 -0800)]
Do not use a user tag on apps, as it is ignored.
The build system does not honor user tags on apps,
and setting it is misleading.
This removes the confusion by making the makefiles
behave like they read.
Change-Id: I98697136596fd1dafd8d21c944cb258b4b7949e8
Lixin Yue [Wed, 23 Dec 2009 07:37:27 +0000 (15:37 +0800)]
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.
Lixin Yue [Wed, 16 Dec 2009 08:07:53 +0000 (16:07 +0800)]
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.
Lixin Yue [Thu, 10 Dec 2009 05:52:53 +0000 (13:52 +0800)]
Update the error codes to be compatible with PBAP spec.
Catch IndexOutOfBoundsException and NullPointerException in Opp sendFile().
Lixin Yue [Thu, 17 Dec 2009 08:31:22 +0000 (16:31 +0800)]
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
Eric Fischer [Fri, 11 Dec 2009 07:40:39 +0000 (23:40 -0800)]
am
1b079725: (-s ours) am
e381d79d: am
da4092ba: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
1b079725add337a35ec0157acc6365cec67a3cf1'
* commit '
1b079725add337a35ec0157acc6365cec67a3cf1':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:52:39 +0000 (17:52 -0800)]
am
e381d79d: am
da4092ba: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
e381d79d0d9c6a787064ae42ec97d0ce2d21909f' into eclair-mr2-plus-aosp
* commit '
e381d79d0d9c6a787064ae42ec97d0ce2d21909f':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:42:27 +0000 (17:42 -0800)]
am
da4092ba: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
da4092baa3ea8ec719f374f9567cc07cdfe48c55' into eclair-mr2
* commit '
da4092baa3ea8ec719f374f9567cc07cdfe48c55':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 01:24:28 +0000 (17:24 -0800)]
Import revised translations. DO NOT MERGE
Lixin Yue [Wed, 2 Dec 2009 01:38:42 +0000 (17:38 -0800)]
am
11bac503: am
6414394c: am
6ee2d0e0: Fix Opp notifications timestamp not correct issue
Merge commit '
11bac503a50bb1e9f465d176fcae3cd668ca6c70'
* commit '
11bac503a50bb1e9f465d176fcae3cd668ca6c70':
Fix Opp notifications timestamp not correct issue
Lixin Yue [Wed, 2 Dec 2009 01:29:04 +0000 (17:29 -0800)]
am
6414394c: am
6ee2d0e0: Fix Opp notifications timestamp not correct issue
Merge commit '
6414394c20cd885f5bd4561e06bbecac9c93cfb1' into eclair-mr2-plus-aosp
* commit '
6414394c20cd885f5bd4561e06bbecac9c93cfb1':
Fix Opp notifications timestamp not correct issue
Lixin Yue [Wed, 2 Dec 2009 01:14:06 +0000 (17:14 -0800)]
am
6ee2d0e0: Fix Opp notifications timestamp not correct issue
Merge commit '
6ee2d0e0405a074cf827e0c0ac4bfbffd1850cea' into eclair-mr2
* commit '
6ee2d0e0405a074cf827e0c0ac4bfbffd1850cea':
Fix Opp notifications timestamp not correct issue
Tao Liejun [Tue, 1 Dec 2009 17:11:29 +0000 (09:11 -0800)]
am
5e95999a: am
019188fd: Merge change Ifb8562d3 into eclair-mr2
Merge commit '
5e95999a79b94802b461160e1d7c9002c93356f4'
* commit '
5e95999a79b94802b461160e1d7c9002c93356f4':
Add a few specific file type support
Tao Liejun [Mon, 30 Nov 2009 22:35:16 +0000 (14:35 -0800)]
am
019188fd: Merge change Ifb8562d3 into eclair-mr2
Merge commit '
019188fd686dbe7a9610255ea8aa61bd589a6bd1' into eclair-mr2-plus-aosp
* commit '
019188fd686dbe7a9610255ea8aa61bd589a6bd1':
Add a few specific file type support
Android (Google) Code Review [Mon, 30 Nov 2009 22:31:14 +0000 (14:31 -0800)]
Merge change Ifb8562d3 into eclair-mr2
* changes:
Add a few specific file type support
Lixin Yue [Mon, 2 Nov 2009 07:51:05 +0000 (15:51 +0800)]
Fix Opp notifications timestamp not correct issue
Should set the value of Notification.when before calling
setLatestEventInfo()
Dr No:Eastham
Bug:
2292381
Tao Liejun [Wed, 18 Nov 2009 17:02:59 +0000 (11:02 -0600)]
Add a few specific file type support
Support to receive and send a few specific file types
.xls, .zip, .doc, .ppt, .pdf
Jaikumar Ganesh [Wed, 25 Nov 2009 23:33:51 +0000 (15:33 -0800)]
am
5a591d7c: am
975bc7ee: am
03f598ba: Catch all exceptions while trying to send a file.
Merge commit '
5a591d7c8562fca872ac907616f6b68917cebc9d'
* commit '
5a591d7c8562fca872ac907616f6b68917cebc9d':
Catch all exceptions while trying to send a file.
Jaikumar Ganesh [Wed, 25 Nov 2009 23:31:29 +0000 (15:31 -0800)]
am
975bc7ee: am
03f598ba: Catch all exceptions while trying to send a file.
Merge commit '
975bc7ee50d8d5b596b1801f2c60057de122d2b0' into eclair-mr2-plus-aosp
* commit '
975bc7ee50d8d5b596b1801f2c60057de122d2b0':
Catch all exceptions while trying to send a file.
Jaikumar Ganesh [Wed, 25 Nov 2009 23:29:05 +0000 (15:29 -0800)]
am
03f598ba: Catch all exceptions while trying to send a file.
Merge commit '
03f598bafa0fc0cbde0c5ab8fed89e07a67d482e' into eclair-mr2
* commit '
03f598bafa0fc0cbde0c5ab8fed89e07a67d482e':
Catch all exceptions while trying to send a file.
Jaikumar Ganesh [Wed, 25 Nov 2009 18:16:08 +0000 (10:16 -0800)]
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
Eric Fischer [Tue, 17 Nov 2009 15:36:10 +0000 (07:36 -0800)]
am
4370c42a: (-s ours) am
c17872fc: am
3238ec15: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
4370c42a4afc3c7aa19dbd086bb65bfebbf6c788'
* commit '
4370c42a4afc3c7aa19dbd086bb65bfebbf6c788':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 Nov 2009 15:36:07 +0000 (07:36 -0800)]
Eric Fischer [Tue, 17 Nov 2009 04:01:41 +0000 (20:01 -0800)]
am
c17872fc: am
3238ec15: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
c17872fc31d23b2e2a6f3f0d45e20fff349f09d2' into eclair-mr2-plus-aosp
* commit '
c17872fc31d23b2e2a6f3f0d45e20fff349f09d2':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 Nov 2009 04:01:38 +0000 (20:01 -0800)]
am
95b2e5f9: am
46979a81: (-s ours) Merge change I37f3fff6 into eclair
Merge commit '
95b2e5f9505a995ce293339fab44c9ec7f7866ea' into eclair-mr2-plus-aosp
* commit '
95b2e5f9505a995ce293339fab44c9ec7f7866ea':
Eric Fischer [Tue, 17 Nov 2009 03:53:43 +0000 (19:53 -0800)]
am
3238ec15: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
3238ec15a6e28571bcab5d89974eb00c8dba76c1' into eclair-mr2
* commit '
3238ec15a6e28571bcab5d89974eb00c8dba76c1':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 Nov 2009 00:44:36 +0000 (16:44 -0800)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:04:43 +0000 (15:04 -0800)]
am
37c35377: merge from open-source master
Merge commit '
37c35377fbcc31ffcb1851b234256687ba465a11'
* commit '
37c35377fbcc31ffcb1851b234256687ba465a11':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:23 +0000 (14:55 -0800)]
merge from open-source master
Eric Fischer [Sat, 14 Nov 2009 01:46:13 +0000 (17:46 -0800)]
am
46979a81: (-s ours) Merge change I37f3fff6 into eclair
Merge commit '
46979a815f4bb0eed73ebc0836eef50ab1756e2b' into eclair-mr2
* commit '
46979a815f4bb0eed73ebc0836eef50ab1756e2b':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Sat, 14 Nov 2009 01:42:41 +0000 (17:42 -0800)]
Merge change I37f3fff6 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:14:49 +0000 (17:14 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jaikumar Ganesh [Fri, 13 Nov 2009 20:16:17 +0000 (12:16 -0800)]
am
5dc084a9: am
39a9c98e: Merge change I8b791d4f into eclair
Merge commit '
5dc084a9ecbe35da9ac506ea4385e58d68e08aa5'
* commit '
5dc084a9ecbe35da9ac506ea4385e58d68e08aa5':
Don't send default phone number for 0.vcf card.
Jaikumar Ganesh [Fri, 13 Nov 2009 20:09:39 +0000 (12:09 -0800)]
am
39a9c98e: Merge change I8b791d4f into eclair
Merge commit '
39a9c98edca4633348d91027b3481ee43d4aa588' into eclair-mr2
* commit '
39a9c98edca4633348d91027b3481ee43d4aa588':
Don't send default phone number for 0.vcf card.
Android (Google) Code Review [Fri, 13 Nov 2009 20:06:22 +0000 (12:06 -0800)]
Merge change I8b791d4f into eclair
* changes:
Don't send default phone number for 0.vcf card.
Eric Fischer [Fri, 13 Nov 2009 19:33:00 +0000 (11:33 -0800)]
am
9fa06d17: (-s ours) am
765403ef: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9fa06d17d94deb79989a61ed1d273085046a21ef'
* commit '
9fa06d17d94deb79989a61ed1d273085046a21ef':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Fri, 13 Nov 2009 18:41:23 +0000 (10:41 -0800)]
Don't send default phone number for 0.vcf card.
This prevents an entry "My name" with "000000" in the car kit contacts.
We now send only the name and the version in the vcf.
Ideally, we could like to send an empty vcard, but we would need to test
with various car kits with that works well.
Original Change by: Lixin Yue
Bug:
2247067
Dr No: Eastham
Eric Fischer [Fri, 13 Nov 2009 18:42:29 +0000 (10:42 -0800)]
am
765403ef: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
765403ef2fdb89dea90822590b9ac794b5a5a532' into eclair-mr2
* commit '
765403ef2fdb89dea90822590b9ac794b5a5a532':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 03:46:49 +0000 (19:46 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Eric Fischer [Sat, 7 Nov 2009 00:22:05 +0000 (16:22 -0800)]
am
8eabbf92: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
8eabbf92bc11dcb7c7d50e0c14ce7814a6dcd2de'
* commit '
8eabbf92bc11dcb7c7d50e0c14ce7814a6dcd2de':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 6 Nov 2009 23:26:01 +0000 (15:26 -0800)]
Import revised translations. DO NOT MERGE
Lixin Yue [Fri, 6 Nov 2009 22:11:46 +0000 (14:11 -0800)]
am
5ce62e92: am
cd5ed0c7: PBAP only transfer contacts that are visible in contacts application.
Merge commit '
5ce62e929e6ce169be5c32c173efc44f76684e2d'
* commit '
5ce62e929e6ce169be5c32c173efc44f76684e2d':
PBAP only transfer contacts that are visible in contacts application.
Lixin Yue [Fri, 6 Nov 2009 21:57:56 +0000 (13:57 -0800)]
am
cd5ed0c7: PBAP only transfer contacts that are visible in contacts application.
Merge commit '
cd5ed0c7d04119e508fbddfd9656ef8559e3e524' into eclair-mr2
* commit '
cd5ed0c7d04119e508fbddfd9656ef8559e3e524':
PBAP only transfer contacts that are visible in contacts application.
Lixin Yue [Thu, 5 Nov 2009 03:45:52 +0000 (11:45 +0800)]
PBAP only transfer contacts that are visible in contacts application.
This is to address below issue:
There have been reports by users where they are seeing contacts in the
carkit that are not present in the Contacts App UI but are present in the
database.
Bug:
2245178
Dr No: Eastham
Jaikumar Ganesh [Wed, 4 Nov 2009 23:20:34 +0000 (15:20 -0800)]
am
ae7f7056: am
2b36e173: Fix get contact size not correct issue.
Merge commit '
ae7f70563660d02d56365092fa27f195b54d5d15'
* commit '
ae7f70563660d02d56365092fa27f195b54d5d15':
Fix get contact size not correct issue.
Jaikumar Ganesh [Wed, 4 Nov 2009 23:09:40 +0000 (15:09 -0800)]
am
2b36e173: Fix get contact size not correct issue.
Merge commit '
2b36e1731eb5ed784abc1a374eb69d8523123df1' into eclair-mr2
* commit '
2b36e1731eb5ed784abc1a374eb69d8523123df1':
Fix get contact size not correct issue.
Jaikumar Ganesh [Tue, 3 Nov 2009 00:05:09 +0000 (16:05 -0800)]
am
757c85e4: (-s ours) am
c065fc55: (-s ours) Disable sending Photo field for PBAP. Do Not Merge.
Merge commit '
757c85e4ce37336dbd549718fbf09a1b36ae4da5'
* commit '
757c85e4ce37336dbd549718fbf09a1b36ae4da5':
Disable sending Photo field for PBAP. Do Not Merge.
Jaikumar Ganesh [Mon, 2 Nov 2009 23:54:28 +0000 (15:54 -0800)]
am
c065fc55: (-s ours) Disable sending Photo field for PBAP. Do Not Merge.
Merge commit '
c065fc5530cc0e8f14261f8c347984cdde070169' into eclair-mr2
* commit '
c065fc5530cc0e8f14261f8c347984cdde070169':
Disable sending Photo field for PBAP. Do Not Merge.
Jaikumar Ganesh [Fri, 30 Oct 2009 18:32:36 +0000 (11:32 -0700)]
Fix get contact size not correct issue.
Call history handles should be ordered by "date DESC" per spec. The first
handle 1.vcf should be the most recently happend call.
Add order support for pullVcardListing reqeust:
One typical use case for PBAP is: first use pullVcardListing request to
display the contacts list, then use pullVcardEntry request to tirgger
the selected contact vcard. In such case, we need keep the contact db
query consistent for pullVcardListing and pullVcardEntry.
Use "Own number" for phone owner number instead of "Unknown name" in case
can not get the name from system.
Original Change: Fan Jackson
Dr No: Eastham
Bug Id:
2183320
Daisuke Miyakawa [Mon, 2 Nov 2009 05:58:41 +0000 (21:58 -0800)]
Daisuke Miyakawa [Mon, 2 Nov 2009 05:58:36 +0000 (21:58 -0800)]
Android (Google) Code Review [Mon, 2 Nov 2009 02:12:51 +0000 (21:12 -0500)]
Merge change I51d7be27 into eclair-mr2
* changes:
Fix a typo.
Daisuke Miyakawa [Mon, 2 Nov 2009 01:42:10 +0000 (10:42 +0900)]
Fix a typo.
Daisuke Miyakawa [Mon, 2 Nov 2009 01:42:10 +0000 (10:42 +0900)]
Fix a typo.
Jaikumar Ganesh [Fri, 30 Oct 2009 21:37:21 +0000 (14:37 -0700)]
Disable sending Photo field for PBAP. Do Not Merge.
Some car kits don't handle contacts with Photo Fields well.
Disable this field for the time being.
Original Change by: Yue Lixin
Bug:
2183320
Dr No: Eastham
Eric Fischer [Thu, 22 Oct 2009 16:46:31 +0000 (09:46 -0700)]
am
d74a0f97: (-s ours) am
99232162: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
d74a0f978908797aab90190ad243e0ee8f42a04d'
* commit '
d74a0f978908797aab90190ad243e0ee8f42a04d':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:47:01 +0000 (06:47 -0700)]
am
99232162: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
992321621151fb0c6d8784c3009472a29f0c6a89' into eclair-mr2
* commit '
992321621151fb0c6d8784c3009472a29f0c6a89':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:42:33 +0000 (10:42 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Daisuke Miyakawa [Thu, 15 Oct 2009 04:05:24 +0000 (21:05 -0700)]
Daisuke Miyakawa [Thu, 15 Oct 2009 03:53:41 +0000 (20:53 -0700)]
Fix a build breakage.
Make Bluetooth code use new type instead of old.
Eric Fischer [Wed, 14 Oct 2009 00:17:47 +0000 (17:17 -0700)]
am
19b9dd3e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
19b9dd3e31e2e7deff759506f9442b08426b91d7'
* commit '
19b9dd3e31e2e7deff759506f9442b08426b91d7':
Import revised translations. DO NOT MERGE
Daisuke Miyakawa [Wed, 14 Oct 2009 00:02:50 +0000 (17:02 -0700)]
am
4ceaa3e0: Adapt to the new interface of vCard code.
Merge commit '
4ceaa3e03dc7a68d4e7c0c8e14a461cfd7c4c19c'
* commit '
4ceaa3e03dc7a68d4e7c0c8e14a461cfd7c4c19c':
Adapt to the new interface of vCard code.
Eric Fischer [Tue, 13 Oct 2009 23:55:35 +0000 (16:55 -0700)]
am
da9ca291: (-s ours) am
5b61241c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
da9ca2915b56dc964ce1e4e53c0cd9085a3c7ea4'
* commit '
da9ca2915b56dc964ce1e4e53c0cd9085a3c7ea4':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Oct 2009 23:30:57 +0000 (16:30 -0700)]
Reimport translations.
Change-Id: Ib613aca3ba7ad0ab906210da90f28699ec96d5dd
Eric Fischer [Tue, 13 Oct 2009 23:04:40 +0000 (16:04 -0700)]
Import revised translations. DO NOT MERGE
Daisuke Miyakawa [Mon, 12 Oct 2009 20:30:57 +0000 (13:30 -0700)]
Adapt to the new interface of vCard code.
Internal Issue number:
2160039
Eric Fischer [Fri, 9 Oct 2009 23:27:11 +0000 (16:27 -0700)]
am
5b61241c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
5b61241c90be1a30d18fe6da116edc16d0ea1b1e' into eclair-mr2
* commit '
5b61241c90be1a30d18fe6da116edc16d0ea1b1e':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 9 Oct 2009 22:35:02 +0000 (15:35 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Android (Google) Code Review [Thu, 8 Oct 2009 23:33:56 +0000 (19:33 -0400)]
Merge change I428bc0fc into eclair
* changes:
Remove STOPSHIP BT logging.
Nick Pelly [Thu, 8 Oct 2009 23:00:55 +0000 (01:00 +0200)]
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.
Jaikumar Ganesh [Thu, 8 Oct 2009 14:16:27 +0000 (07:16 -0700)]
Update PBAP code for Contacts database changes and check for OPP
file extension.
Original Author for PBAP - Yue Lixin
Dr No: Eastham
Bug:
2174759
Nick Pelly [Wed, 7 Oct 2009 22:57:45 +0000 (00:57 +0200)]
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.
Android (Google) Code Review [Mon, 5 Oct 2009 16:42:43 +0000 (12:42 -0400)]
Merge change I773ca65d into eclair
* changes:
Remove Disconnected and Connected PBAP toasts.
Jaikumar Ganesh [Mon, 5 Oct 2009 10:43:49 +0000 (03:43 -0700)]
Remove Disconnected and Connected PBAP toasts.
Original Author: Fan Jackson
Bug number:
2060933
Dr No: Eastham
Dianne Hackborn [Sun, 4 Oct 2009 20:33:24 +0000 (13:33 -0700)]
Work on issue #
2163789: Way too much logging
Dr.No from mcleron.
Change-Id: I1a0475bebcb7e38ae4859c18afe9d5b093544e09
Android (Google) Code Review [Fri, 2 Oct 2009 07:58:20 +0000 (03:58 -0400)]
Merge change I196e84e5 into eclair
* changes:
More icons
Mike Cleron [Fri, 2 Oct 2009 07:33:14 +0000 (00:33 -0700)]
More icons
Jaikumar Ganesh [Fri, 2 Oct 2009 00:02:30 +0000 (17:02 -0700)]
Fix ANR by repeating BT ON/OFF caused by PBAP closeservice deadlock
Move back socket closing sequence ahead of Thread.shutdown and join operation;
Seperate socket closing and resetting as null to avoid NPE during service close
Original Author: Fan Jackson
Bug:
2158262
DrNo: Paul
Change-Id: I2b36f3fb920c80602f5734a67a8cf6c6fbd00de4
Android (Google) Code Review [Wed, 30 Sep 2009 18:20:05 +0000 (14:20 -0400)]
Merge change I3d0e5c00 into eclair
* changes:
Placeholder mdpi assets
Daisuke Miyakawa [Wed, 30 Sep 2009 18:15:05 +0000 (11:15 -0700)]
Remove redundant dependency toward android.syncml.
Mike Cleron [Wed, 30 Sep 2009 18:01:23 +0000 (11:01 -0700)]
Placeholder mdpi assets
Android (Google) Code Review [Wed, 30 Sep 2009 16:29:36 +0000 (12:29 -0400)]
Merge change I8222c790 into eclair
* changes:
Update OPP/PBAP service to use onStartCommand() Adjust function call seqence in PBAP closeService
Lixin Yue [Tue, 29 Sep 2009 08:29:47 +0000 (16:29 +0800)]
Update OPP/PBAP service to use onStartCommand()
Adjust function call seqence in PBAP closeService
Mike Cleron [Wed, 30 Sep 2009 08:09:18 +0000 (01:09 -0700)]
Newer icons
Android (Google) Code Review [Wed, 30 Sep 2009 04:35:44 +0000 (00:35 -0400)]
Merge change I60a29b85 into eclair
* changes:
New hdpi assets.
Daniel Sandler [Wed, 30 Sep 2009 04:33:55 +0000 (00:33 -0400)]
New hdpi assets.
Drop dated 29-Sep-2009.
Change-Id: I60a29b855fd8c259e16408006a5a3c5cf768dc7d
Lixin Yue [Tue, 29 Sep 2009 05:57:36 +0000 (13:57 +0800)]
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
Android (Google) Code Review [Tue, 29 Sep 2009 20:14:13 +0000 (16:14 -0400)]
Merge change Iae70ee2e into eclair
* changes:
New icons
Mike Cleron [Tue, 29 Sep 2009 20:03:26 +0000 (13:03 -0700)]
New icons
Android (Google) Code Review [Tue, 29 Sep 2009 01:54:50 +0000 (21:54 -0400)]
Merge change I18bde766 into eclair
* changes:
Update PBAP to make compatiable with spec
Lixin Yue [Sun, 27 Sep 2009 05:03:16 +0000 (13:03 +0800)]
Update PBAP to make compatiable with spec
Add check to incoming application parameter, be nice to accept PCE request
Fix minor pullvCardEntry issue for call logs
Fix one pullPhoneBook issue about request size
Android (Google) Code Review [Mon, 28 Sep 2009 21:10:56 +0000 (17:10 -0400)]
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
Oscar Montemayor [Mon, 28 Sep 2009 20:53:34 +0000 (13:53 -0700)]
Added WhiteList of acceptable MIME types for OBEX transfers. Part of OBEX/OPP security review.
Bug information: http://b/issue?id=
1972237
Nick Pelly [Mon, 28 Sep 2009 19:27:29 +0000 (12:27 -0700)]
Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Change-Id: Ia0eb46d9bdff6a8ab3333bb0ad1f66d0303c135a
Oscar Montemayor [Sun, 27 Sep 2009 20:24:54 +0000 (13:24 -0700)]
Proposed file canonical path prevetion for directory trasvesal attacks. Fix suggested by meder@google.com.
More fixes form CR comments.
Lixin Yue [Thu, 24 Sep 2009 07:28:11 +0000 (15:28 +0800)]
Update PBAP to use new VCardComposer
Totally removed the use of old syncml.pim.vcard.VCardComposer
Tao Liejun [Mon, 21 Sep 2009 12:43:57 +0000 (20:43 +0800)]
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
Android (Google) Code Review [Thu, 24 Sep 2009 01:27:06 +0000 (21:27 -0400)]
Merge change 26736 into eclair
* changes:
Update opp/pbap look and feel
Rich Cannings [Wed, 23 Sep 2009 21:33:17 +0000 (14:33 -0700)]
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.