OSDN Git Service
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:36:02 +0000 (11:36 -0800)]
Merge "Incorrect response code after pull of invalid vCard handle."
Staffan Lindvall [Tue, 7 Dec 2010 13:15:51 +0000 (14:15 +0100)]
Incorrect response code after pull of invalid vCard handle.
When calling pullVcardEntry with an invalid / non-existing
vCard handle the response code is always "OK".
Instead the phone should respond "NOT FOUND" according
to Bluetooth PBAP specification.
The problem exists both for phonebook and call logs.
Change-Id: I339b1fe0cdb7fa9b6c6b425f1b1686c24cab9626
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:29:27 +0000 (11:29 -0800)]
Merge "Sanitise Bluetooth file name hint when receiving a contact"
Edward Savage-Jones [Tue, 28 Sep 2010 12:39:44 +0000 (14:39 +0200)]
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
Jean-Baptiste Queru [Tue, 7 Dec 2010 22:04:34 +0000 (14:04 -0800)]
resolved conflicts for merge of
55936599 to stage-korg-master
Change-Id: I5f04a3ae2f0246853f16b0fdb209e67df95e6ca8
Jean-Baptiste Queru [Tue, 7 Dec 2010 21:35:11 +0000 (13:35 -0800)]
Merge "code cleanup. unused imports, local variabls and static constans removed from com.android.bluetooth.opp package."
Jean-Baptiste Queru [Tue, 7 Dec 2010 21:33:36 +0000 (13:33 -0800)]
am
16d171b1: Merge "code cleanup. some unused import statement, local variabls, private members and static constants removed form classes in com.android.bluetooth/pbap package."
* commit '
16d171b1ba7bd2b74c15b9f4d0289de84117cbb5':
code cleanup. some unused import statement, local variabls, private members and static constants removed form classes in com.android.bluetooth/pbap package.
Jean-Baptiste Queru [Tue, 7 Dec 2010 21:26:48 +0000 (13:26 -0800)]
Merge "code cleanup. some unused import statement, local variabls, private members and static constants removed form classes in com.android.bluetooth/pbap package."
Eric Fischer [Thu, 11 Nov 2010 23:49:11 +0000 (15:49 -0800)]
am
2acef5de: Import revised translations. DO NOT MERGE
* commit '
2acef5dec3faa043fc433f4f7f22a3e002d89bd0':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 9 Nov 2010 20:16:53 +0000 (12:16 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I63625c958e02adf11ab0dd21c0432a924acb5b57
Mohammad Shamsi [Mon, 1 Nov 2010 17:04:20 +0000 (01:04 +0800)]
code cleanup.
unused imports, local variabls and static constans removed from
com.android.bluetooth.opp package.
Change-Id: I0fd682a190221e216fac71723c05d3828b9fa42d
Mohammad Shamsi [Mon, 1 Nov 2010 16:12:03 +0000 (00:12 +0800)]
code cleanup.
some unused import statement, local variabls, private members and static constants removed form
classes in com.android.bluetooth/pbap package.
Change-Id: I95d7d403ab78afa6f9ada82cfb357056a6bf61d0
Eric Fischer [Tue, 26 Oct 2010 00:12:08 +0000 (17:12 -0700)]
am
afd569b4: Import revised translations. DO NOT MERGE
Merge commit '
afd569b4b294e226fa6c35a4ee863bd189daf62a' into gingerbread-plus-aosp
* commit '
afd569b4b294e226fa6c35a4ee863bd189daf62a':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 23:49:51 +0000 (16:49 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I3067481b00b451811cce1795d23f5c9402bdaa04
Eric Fischer [Mon, 25 Oct 2010 23:16:23 +0000 (16:16 -0700)]
am
c0460579: Import revised translations. DO NOT MERGE
Merge commit '
c0460579699b696eceec5eadbfcdc1543aa45929' into gingerbread-plus-aosp
* commit '
c0460579699b696eceec5eadbfcdc1543aa45929':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 22:42:56 +0000 (15:42 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ia8c5a9b2ad897e37c09be2a951c6734e637bb145
Eric Fischer [Wed, 20 Oct 2010 20:57:15 +0000 (13:57 -0700)]
am
2acd43d3: Replace shared storage with USB storage.
Merge commit '
2acd43d31cf5ffdda9b4e72a303c1db7205af613' into gingerbread-plus-aosp
* commit '
2acd43d31cf5ffdda9b4e72a303c1db7205af613':
Replace shared storage with USB storage.
Eric Fischer [Wed, 20 Oct 2010 01:11:55 +0000 (18:11 -0700)]
Replace shared storage with USB storage.
Change-Id: Ia32a91daad6e0247fa6d870207d56724535d0f61
Kenny Root [Sat, 16 Oct 2010 01:41:15 +0000 (18:41 -0700)]
am
b141d86c: Import revised translations DO NOT MERGE
Merge commit '
b141d86cda32d072851ee661caa7ddaa20526aeb' into gingerbread-plus-aosp
* commit '
b141d86cda32d072851ee661caa7ddaa20526aeb':
Import revised translations DO NOT MERGE
Kenny Root [Fri, 15 Oct 2010 22:18:43 +0000 (15:18 -0700)]
Import revised translations DO NOT MERGE
Change-Id: I70140735d15c789f795d5fdd3759d6666d3798ea
Kenny Root [Thu, 14 Oct 2010 21:56:13 +0000 (14:56 -0700)]
am
7facaf19: Import revised translations
Merge commit '
7facaf194dfe5b1d2bb2e59dfca355db07d0c8c4' into gingerbread-plus-aosp
* commit '
7facaf194dfe5b1d2bb2e59dfca355db07d0c8c4':
Import revised translations
Kenny Root [Thu, 14 Oct 2010 16:42:33 +0000 (09:42 -0700)]
Import revised translations
Change-Id: I71274a01ab66aeecb0d13b8708589a2df49f3403
Jaikumar Ganesh [Tue, 12 Oct 2010 20:57:03 +0000 (13:57 -0700)]
am
4492b2c6: Fix OPP crash and Call Log sort order.
Merge commit '
4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2' into gingerbread-plus-aosp
* commit '
4492b2c66cf3b26fd988f3b7f1f5df6cc9ed49f2':
Fix OPP crash and Call Log sort order.
Jaikumar Ganesh [Tue, 12 Oct 2010 18:49:18 +0000 (11:49 -0700)]
Fix OPP crash and Call Log sort order.
Bug:
3067780 3067770
Dr No: jerry
Change-Id: I2ac39e2f1f0233a6ada84af39d8addfe0fe04cea
Jaikumar Ganesh [Sun, 10 Oct 2010 18:08:18 +0000 (11:08 -0700)]
am
3f475149: Merge "Make "search by number" function work" into gingerbread
Merge commit '
3f475149a4c74ccce703cab676283ab4355dc3c6' into gingerbread-plus-aosp
* commit '
3f475149a4c74ccce703cab676283ab4355dc3c6':
Make "search by number" function work
Jaikumar Ganesh [Sun, 10 Oct 2010 17:57:00 +0000 (10:57 -0700)]
Merge "Make "search by number" function work" into gingerbread
Jaikumar Ganesh [Fri, 8 Oct 2010 00:00:38 +0000 (17:00 -0700)]
am
e298302a: Merge "Add intent filter to PBAP service." into gingerbread
Merge commit '
e298302a02408a2440fac8a7e84f8b8403c99371' into gingerbread-plus-aosp
* commit '
e298302a02408a2440fac8a7e84f8b8403c99371':
Add intent filter to PBAP service.
Jaikumar Ganesh [Thu, 7 Oct 2010 23:56:20 +0000 (16:56 -0700)]
Merge "Add intent filter to PBAP service." into gingerbread
Liejun Tao [Tue, 5 Oct 2010 17:21:25 +0000 (12:21 -0500)]
Make "search by number" function work
Previous "search by number" is wrong. Re-implement it to make it work.
Add flexible to handle searchValue as both null-terminated and not
null-terminated.
Change-Id: Ie50f8d29dfcbae868c43d482467b09b08ed2be0f
Jaikumar Ganesh [Wed, 6 Oct 2010 22:39:15 +0000 (00:39 +0200)]
Add intent filter to PBAP service.
Change-Id: I4059c74fcd6622c0e5688ffa171ff5d1f3be6b8f
Nick Pelly [Tue, 5 Oct 2010 23:56:24 +0000 (16:56 -0700)]
am
82d9bdb1: Merge "Don\'t enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread
Merge commit '
82d9bdb117558939d975ca996522f881b0985a68' into gingerbread-plus-aosp
* commit '
82d9bdb117558939d975ca996522f881b0985a68':
Don't enforce Authenticated Link key (MITM protection) on PBAP.
Nick Pelly [Tue, 5 Oct 2010 23:53:23 +0000 (16:53 -0700)]
Merge "Don't enforce Authenticated Link key (MITM protection) on PBAP." into gingerbread
Jaikumar Ganesh [Mon, 4 Oct 2010 21:51:52 +0000 (23:51 +0200)]
Don't enforce Authenticated Link key (MITM protection) on PBAP.
Gory Details:
SecureRfcomm API => authentication is true and encyrption is true. (HIGH)
InSecureRfcomm API => authentication is false and encryption is true. (MEDIUM)
The authentication above refers to the authentication of the link
key i.e prevention of MITM attacks.
Bluetooth 2.0 legacy pairing doesn't provide MITM protection.
Bluetooth 2.1 -> If pairing is done with MITM protection already,
this doesn't matter. If pairing is NOT done with MITM protection
we have the same security as the other core profiles. It dones't make
sense to enfore MITM for this profile while having Handsfree profile
to not have MITM i.e some attacker can listen in on conversations.
Why are we changing this now: More headsets with 2.1 and No Input/Output
have started to support PBAP. So we pair without MITM with them and then
when the PBAP request comes it fails because we need MITM protection and
we try to exchange keys (i.e pair again)
The headset don't allow pairing to happen at any time because its a security
issue and hence PBAP request fails.
Change-Id: Ia80c15c545e9396e7c6882b731c90a8ede119827
Gilles Debunne [Mon, 4 Oct 2010 19:07:20 +0000 (12:07 -0700)]
am
0ca9e88b: New bluetooth folder icons. Bug
3040343
Merge commit '
0ca9e88b03dd34a1bbf63a218d34a7449ff2635b' into gingerbread-plus-aosp
* commit '
0ca9e88b03dd34a1bbf63a218d34a7449ff2635b':
New bluetooth folder icons. Bug
3040343
Gilles Debunne [Mon, 4 Oct 2010 18:43:54 +0000 (11:43 -0700)]
New bluetooth folder icons. Bug
3040343
Change-Id: I4d89a58a5180a150635768e3d46a38ed61d96f51
Ola Johnsson [Mon, 4 Oct 2010 12:23:39 +0000 (05:23 -0700)]
am
4ce32fcc: PullvCardList implemented according to specification
Merge commit '
4ce32fccf381a3b448f0d5ff56665201c0e0e6d3' into gingerbread-plus-aosp
* commit '
4ce32fccf381a3b448f0d5ff56665201c0e0e6d3':
PullvCardList implemented according to specification
Ola Johnsson [Wed, 16 Jun 2010 08:39:05 +0000 (10:39 +0200)]
PullvCardList implemented according to specification
The value tag sent as a byte array was not parsed correctly
leading to illegal strings. The list count value was not used
according to the specification, now refers to number of entries
that should be returned. Specification for Phone book access
profile chapter 5.3 default max list size of OxFFFF (65535)
taken from 5.3.4.4. Now uses default values when Application
Parameter headers are missing.
Change-Id: Ib17f2208a91b4f896d9beebaf3a21566502ac291
Eric Fischer [Thu, 30 Sep 2010 22:54:34 +0000 (15:54 -0700)]
am
34760a31: Import revised translations. DO NOT MERGE
Merge commit '
34760a3117ff3fe4f1e8fe80c9367bcc7390c2b6' into gingerbread-plus-aosp
* commit '
34760a3117ff3fe4f1e8fe80c9367bcc7390c2b6':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 29 Sep 2010 21:30:20 +0000 (14:30 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I0f5729fa9041ac4ba030b939b899f66d0952d1c6
Eric Fischer [Wed, 29 Sep 2010 17:56:17 +0000 (10:56 -0700)]
am
a26109b2: Merge "Split strings with SD card references into variations." into gingerbread
Merge commit '
a26109b280f2967514454a9b99522faeb35f580f' into gingerbread-plus-aosp
* commit '
a26109b280f2967514454a9b99522faeb35f580f':
Split strings with SD card references into variations.
Eric Fischer [Wed, 29 Sep 2010 17:53:31 +0000 (10:53 -0700)]
Merge "Split strings with SD card references into variations." into gingerbread
Jaikumar Ganesh [Wed, 29 Sep 2010 01:13:11 +0000 (18:13 -0700)]
am
5f78d4ef: Merge "Update BT folder icon." into gingerbread
Merge commit '
5f78d4ef75710e3dbf608644b16da7c6f88d00ed' into gingerbread-plus-aosp
* commit '
5f78d4ef75710e3dbf608644b16da7c6f88d00ed':
Update BT folder icon.
Jaikumar Ganesh [Wed, 29 Sep 2010 01:10:48 +0000 (18:10 -0700)]
Merge "Update BT folder icon." into gingerbread
Jaikumar Ganesh [Wed, 29 Sep 2010 01:09:57 +0000 (18:09 -0700)]
Update BT folder icon.
Change-Id: I1aecca20d4a9aaaf8e4aad37eb5c2e2357fad6ad
Eric Fischer [Tue, 28 Sep 2010 23:34:10 +0000 (16:34 -0700)]
Split strings with SD card references into variations.
Change-Id: Ie01f4de45b427f06b0daec3847b865d0e4b2d6e7
Brad Fitzpatrick [Tue, 28 Sep 2010 17:34:59 +0000 (10:34 -0700)]
am
0a79bdbb: Trim the Bluetooth database off the main thread.
Merge commit '
0a79bdbbfa3b79b808cbbe7490731e5aae4489e9' into gingerbread-plus-aosp
* commit '
0a79bdbbfa3b79b808cbbe7490731e5aae4489e9':
Trim the Bluetooth database off the main thread.
Brad Fitzpatrick [Tue, 28 Sep 2010 15:53:41 +0000 (08:53 -0700)]
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
Eric Fischer [Mon, 27 Sep 2010 19:31:10 +0000 (12:31 -0700)]
am
d50b3d13: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '
d50b3d1388577370cfe61c34b238cb6c245667a8' into gingerbread-plus-aosp
* commit '
d50b3d1388577370cfe61c34b238cb6c245667a8':
Trim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 19:26:50 +0000 (12:26 -0700)]
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 27 Sep 2010 19:16:38 +0000 (12:16 -0700)]
Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: I22c96b9e3540bd220c01987a0830c3e6b2420e29
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:42:14 +0000 (17:42 -0700)]
am
58ffcb38: reconcile froyo-release into gingerbread
Merge commit '
58ffcb38828199b04a756e93a525779554efd9c9' into gingerbread-plus-aosp
* commit '
58ffcb38828199b04a756e93a525779554efd9c9':
Fix string placeholders that got mangled in translation. DO NOT MERGE
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:30:07 +0000 (17:30 -0700)]
reconcile froyo-release into gingerbread
Change-Id: I5b2492a62bab246a41ad43f45f7a1d4c13b15985
a5206c [Wed, 22 Sep 2010 20:34:39 +0000 (13:34 -0700)]
am
77b122f5: For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
Merge commit '
77b122f551ae37811c75ae76fa2029f7b3f2f404' into gingerbread-plus-aosp
* commit '
77b122f551ae37811c75ae76fa2029f7b3f2f404':
For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
a5206c [Wed, 22 Sep 2010 19:47:06 +0000 (03:47 +0800)]
For PBAP, Limit the number of call log to CALLLOG_NUM_LIMIT
Eric Fischer [Thu, 9 Sep 2010 18:58:37 +0000 (11:58 -0700)]
Fix string placeholders that got mangled in translation. DO NOT MERGE
Pull the new versions of the three affected strings back from gingerbread
(where the placeholders are explicitly marked as such) and reimport the
zh-rTW translations.
Change-Id: Ica839e87d3efe32f5cc8ae0ab42346d8f60d3015
Eric Fischer [Thu, 9 Sep 2010 23:20:06 +0000 (16:20 -0700)]
am
037bb6c9: am
bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE
Merge commit '
037bb6c989f4bbce24585abcca790fdc3115ff14' into gingerbread-plus-aosp
* commit '
037bb6c989f4bbce24585abcca790fdc3115ff14':
Fix string placeholders that got mangled in translation. DO NOT MERGE
Eric Fischer [Thu, 9 Sep 2010 23:17:16 +0000 (16:17 -0700)]
am
bf992c5b: (-s ours) Fix string placeholders that got mangled in translation. DO NOT MERGE
Merge commit '
bf992c5b8417c41779e6cb5890b65949dc3353bf' into gingerbread
* commit '
bf992c5b8417c41779e6cb5890b65949dc3353bf':
Fix string placeholders that got mangled in translation. DO NOT MERGE
Eric Fischer [Thu, 9 Sep 2010 18:58:37 +0000 (11:58 -0700)]
Fix string placeholders that got mangled in translation. DO NOT MERGE
Pull the new versions of the three affected strings back from gingerbread
(where the placeholders are explicitly marked as such) and reimport the
zh-rTW translations.
Change-Id: Ica839e87d3efe32f5cc8ae0ab42346d8f60d3015
Brad Fitzpatrick [Fri, 3 Sep 2010 21:55:19 +0000 (14:55 -0700)]
am
55470710: Replace use of SharedPreference commit() with apply().
Merge commit '
55470710c2624bde2aa56275d29b60055638c06c' into gingerbread-plus-aosp
* commit '
55470710c2624bde2aa56275d29b60055638c06c':
Replace use of SharedPreference commit() with apply().
Brad Fitzpatrick [Fri, 3 Sep 2010 20:57:15 +0000 (13:57 -0700)]
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
Daisuke Miyakawa [Thu, 2 Sep 2010 19:59:32 +0000 (12:59 -0700)]
am
0ddb8aab: Modify variables used in vCard code.
Merge commit '
0ddb8aabe0f62d7741ee0aa040e43643b823c441' into gingerbread-plus-aosp
* commit '
0ddb8aabe0f62d7741ee0aa040e43643b823c441':
Modify variables used in vCard code.
Daisuke Miyakawa [Thu, 2 Sep 2010 19:53:43 +0000 (12:53 -0700)]
Modify variables used in vCard code.
See also Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
Change-Id: I3a94e86d0788a395ac0744bdf6e31c8e64fb0c15
Edward Savage-Jones [Mon, 30 Aug 2010 20:20:48 +0000 (13:20 -0700)]
am
b8c5dba8: Send vCard with Unicode encoded Strings over BT
Merge commit '
b8c5dba8b3e9a46873b8568d5cbead6d7390f96b' into gingerbread-plus-aosp
* commit '
b8c5dba8b3e9a46873b8568d5cbead6d7390f96b':
Send vCard with Unicode encoded Strings over BT
Jaikumar Ganesh [Mon, 30 Aug 2010 19:33:46 +0000 (12:33 -0700)]
am
8e658ce5: Merge "Send vCard with Unicode encoded Strings over BT" into gingerbread
Merge commit '
8e658ce507d2525616ca27aa7135032eee9a5e75' into gingerbread-plus-aosp
* commit '
8e658ce507d2525616ca27aa7135032eee9a5e75':
Send vCard with Unicode encoded Strings over BT
Eric Fischer [Mon, 30 Aug 2010 19:32:57 +0000 (12:32 -0700)]
am
6bbc1370: Import revised translations. DO NOT MERGE
Merge commit '
6bbc13705ca8a9798607a63f2f251e0f992885b7' into gingerbread-plus-aosp
* commit '
6bbc13705ca8a9798607a63f2f251e0f992885b7':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Mon, 30 Aug 2010 18:21:23 +0000 (11:21 -0700)]
Merge "Send vCard with Unicode encoded Strings over BT" into gingerbread
Edward Savage-Jones [Fri, 27 Aug 2010 10:05:58 +0000 (12:05 +0200)]
Send vCard with Unicode encoded Strings over BT
The standard Android code doesn't correctly handle creation of byte
packets when sending vCard data. The length of a String is used to
specify the number of bytes being sent, which works if all
characters are ASCII (1 byte per char), but if Unicode characters
exist within the string, then bytes vs String length differ which
causes a truncation of the vCard during Bluetooth send.
Change-Id: Ic39dd53a38f1f353523c625940b0317b00e86d4f
Eric Fischer [Sat, 28 Aug 2010 00:10:00 +0000 (17:10 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I6059c994c650c5e581a8e953616aaf3941b5afb1
Edward Savage-Jones [Fri, 27 Aug 2010 10:05:58 +0000 (12:05 +0200)]
Send vCard with Unicode encoded Strings over BT
The standard Android code doesn't correctly handle creation of byte
packets when sending vCard data. The length of a String is used to
specify the number of bytes being sent, which works if all
characters are ASCII (1 byte per char), but if Unicode characters
exist within the string, then bytes vs String length differ which
causes a truncation of the vCard during Bluetooth send.
Change-Id: Ic39dd53a38f1f353523c625940b0317b00e86d4f
Jaikumar Ganesh [Wed, 18 Aug 2010 20:39:26 +0000 (13:39 -0700)]
am
4a27976f: Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread
Merge commit '
4a27976f0c876e4159bec9dbf3fed0eb49bf60ed' into gingerbread-plus-aosp
* commit '
4a27976f0c876e4159bec9dbf3fed0eb49bf60ed':
Add tags around string formatting placeholders. DO NOT MERGE
Eric Fischer [Wed, 18 Aug 2010 20:36:18 +0000 (13:36 -0700)]
am
98a1288a: Import revised translations. DO NOT MERGE
Merge commit '
98a1288abc737a8dc00d044c0f5ca306bc4b2880' into gingerbread-plus-aosp
* commit '
98a1288abc737a8dc00d044c0f5ca306bc4b2880':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Wed, 18 Aug 2010 18:25:58 +0000 (11:25 -0700)]
Merge "Add tags around string formatting placeholders. DO NOT MERGE" into gingerbread
Eric Fischer [Tue, 20 Apr 2010 01:23:11 +0000 (18:23 -0700)]
Add tags around string formatting placeholders. DO NOT MERGE
Make the wording of one error message more idiomatic.
Change-Id: I1a427c8a211bca9b8c5261ceda37edf64ceb556c
Eric Fischer [Tue, 17 Aug 2010 23:44:19 +0000 (16:44 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic1f84b8846c17593036d8ac09baaeb96a4244c44
Jaikumar Ganesh [Wed, 11 Aug 2010 19:07:33 +0000 (12:07 -0700)]
am
ff2927dc: Merge "Optimize Opp Notification" into gingerbread
Merge commit '
ff2927dcdff66114e56b0636d6b29ac71f62508b' into gingerbread-plus-aosp
* commit '
ff2927dcdff66114e56b0636d6b29ac71f62508b':
Optimize Opp Notification
Jaikumar Ganesh [Wed, 11 Aug 2010 18:37:39 +0000 (11:37 -0700)]
Merge "Optimize Opp Notification" into gingerbread
Liejun Tao [Mon, 2 Aug 2010 22:37:23 +0000 (17:37 -0500)]
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
Eric Fischer [Tue, 10 Aug 2010 18:57:57 +0000 (11:57 -0700)]
am
8759d55e: Import revised translations. DO NOT MERGE
Merge commit '
8759d55ec0668dec9ca2439085fe314fb0f21d27' into gingerbread-plus-aosp
* commit '
8759d55ec0668dec9ca2439085fe314fb0f21d27':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 Aug 2010 18:50:57 +0000 (11:50 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I2df2905587fcb58d7e40677282f0fa3eb27622e4
Eric Fischer [Wed, 4 Aug 2010 17:54:03 +0000 (10:54 -0700)]
am
6c75d2f1: Import revised translations. DO NOT MERGE
Merge commit '
6c75d2f16e09a66927aad03423ce191f860369d3' into gingerbread-plus-aosp
* commit '
6c75d2f16e09a66927aad03423ce191f860369d3':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 4 Aug 2010 17:40:59 +0000 (10:40 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I751dea57ff96b08328284c6489acffafab0ebd51
The Android Open Source Project [Fri, 16 Jul 2010 20:08:06 +0000 (13:08 -0700)]
merge from open-source master
Change-Id: Id325ee50130e50b8080fd3a1e51a4fda8371e4c8
Ola Johnsson [Wed, 16 Jun 2010 08:39:05 +0000 (10:39 +0200)]
PullvCardList implemented according to specification
The value tag sent as a byte array was not parsed correctly
leading to illegal strings. The list count value was not used
according to the specification, now refers to number of entries
that should be returned. Specification for Phone book access
profile chapter 5.3 default max list size of OxFFFF (65535)
taken from 5.3.4.4. Now uses default values when Application
Parameter headers are missing.
Change-Id: Ib17f2208a91b4f896d9beebaf3a21566502ac291
Kenny Root [Mon, 21 Jun 2010 18:17:12 +0000 (11:17 -0700)]
am
252a2736: Import revised translations
Merge commit '
252a273678109302c6c4a3e35306f5fe9ce52738' into gingerbread
* commit '
252a273678109302c6c4a3e35306f5fe9ce52738':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 18:04:14 +0000 (11:04 -0700)]
Import revised translations
Change-Id: Ia0887bd64eafcb3a3ef329b84805a2859cde44eb
Kenny Root [Mon, 21 Jun 2010 15:58:49 +0000 (08:58 -0700)]
am
25c3b801: Import revised translations
Merge commit '
25c3b801069d8c44854093b3cd1a93ecb9654020' into gingerbread
* commit '
25c3b801069d8c44854093b3cd1a93ecb9654020':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 01:56:36 +0000 (18:56 -0700)]
Import revised translations
Change-Id: I5351f0f604a561458f284c0e9444d5aec7767733
Kenny Root [Thu, 10 Jun 2010 05:31:36 +0000 (22:31 -0700)]
am
2b72fec0: Import revised translations
Merge commit '
2b72fec02d9094b1fc43694046f44ce511328f86' into kraken
* commit '
2b72fec02d9094b1fc43694046f44ce511328f86':
Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:26:43 +0000 (22:26 -0700)]
Import revised translations
Change-Id: I118b7e54616b1144be81c8e9ea5de04efb388a97
Jaikumar Ganesh [Tue, 8 Jun 2010 00:00:34 +0000 (17:00 -0700)]
Merge "Set number as "Unknown" for private numbers." into kraken
Jaikumar Ganesh [Mon, 7 Jun 2010 17:08:11 +0000 (10:08 -0700)]
Set number as "Unknown" for private numbers.
Change-Id: I54bb9595913c90e72eef659627d95bb63398e84a
Joe Onorato [Thu, 3 Jun 2010 20:52:33 +0000 (13:52 -0700)]
This icon shouldn't be animated, and that private class is gone.
Change-Id: I1652c4685c31b55e6519a9180490d86634732d87
Kenny Root [Fri, 28 May 2010 21:28:56 +0000 (14:28 -0700)]
Fix-up es-419 translation
Change-Id: If56b21a216ffa585fa3c1c6134a7fefcd62caa0e
David Yue [Thu, 27 May 2010 07:11:15 +0000 (15:11 +0800)]
correct PBAP call log parameters
Kenny Root [Mon, 17 May 2010 21:02:34 +0000 (14:02 -0700)]
am
4900671a: Import revised translations
Merge commit '
4900671aa3d9329c8065c7da4e5ae544ed85b9e2' into kraken
* commit '
4900671aa3d9329c8065c7da4e5ae544ed85b9e2':
Import revised translations
Kenny Root [Mon, 17 May 2010 18:23:51 +0000 (11:23 -0700)]
Import revised translations
Change-Id: Ic96221d5e692ef4089ef4db39bcfedc392e6d321
Jaikumar Ganesh [Sat, 15 May 2010 00:50:30 +0000 (17:50 -0700)]
am
6a148f10: Run Bluetooth Opp activities in the phone process.
Merge commit '
6a148f10d0e26eef9f94e08ac3f1897ce8983bfa' into kraken
* commit '
6a148f10d0e26eef9f94e08ac3f1897ce8983bfa':
Run Bluetooth Opp activities in the phone process.
Jaikumar Ganesh [Fri, 14 May 2010 22:00:28 +0000 (15:00 -0700)]
Run Bluetooth Opp activities in the phone process.
There were just too much shared code between the classes - we
cannot have them in 2 different process - it can work sometimes and
will fail sometimes depending on the ordering of processes.
Rework involves a lot of code change at this point of time.
Bug:
2684281
Change-Id: I76784650c5f635c1e961392b682c1d33fc2f343f
Daisuke Miyakawa [Thu, 15 Apr 2010 02:04:42 +0000 (11:04 +0900)]
Use FLAG_REFRAIN_PHONE_NUMBER_FORMATTING to prevent discard
of "+", "p", "w" etc in phone numbers.
Change-Id: Ic69d60e5831e59a497c523aa62c753922edf06f6
David Yue [Wed, 12 May 2010 14:53:08 +0000 (07:53 -0700)]
am
b7533e86: Add missing moveToNext() calling.
Merge commit '
b7533e86bb84a2f95c2cff62c1565a8e1696d1ea' into kraken
* commit '
b7533e86bb84a2f95c2cff62c1565a8e1696d1ea':
Add missing moveToNext() calling.
OSDN Git Service
