OSDN Git Service
Jaikumar Ganesh [Wed, 1 Jun 2011 16:20:48 +0000 (09:20 -0700)]
Merge "Handle OBEX Abort packets sent from remote device"
Andreas Areskoug [Tue, 22 Feb 2011 08:20:34 +0000 (09:20 +0100)]
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>
Jaikumar Ganesh [Thu, 26 May 2011 03:22:58 +0000 (20:22 -0700)]
Merge "Require bonding and encryption for PBAP server"
Jaikumar Ganesh [Fri, 20 May 2011 21:55:21 +0000 (14:55 -0700)]
Merge "BT: Fix for vCard Listing error"
Conley Owens [Fri, 29 Apr 2011 18:32:24 +0000 (11:32 -0700)]
am
f6dace4a: Merge "Bluetooth: Add vCard version support for call history."
* commit '
f6dace4a1ed909d9a5f87781a7c4e02cc06fc021':
Bluetooth: Add vCard version support for call history.
Conley Owens [Fri, 29 Apr 2011 18:27:46 +0000 (11:27 -0700)]
Merge "Bluetooth: Add vCard version support for call history."
Par-Gunnar Hjalmdahl [Tue, 5 Apr 2011 11:29:49 +0000 (13:29 +0200)]
BT: Fix for vCard Listing error
This patch fixes listing of the incomplete vCard xml file, which
contains special characters which are larger than one byte.
Change-Id: Ice5a056004aa30255a06f8742428d4bcfa5813c8
Signed-off-by: christian bejram <christian.bejram@stericsson.com>
Eric Fischer [Wed, 27 Apr 2011 22:31:10 +0000 (15:31 -0700)]
am
6d48feaa: Import revised translations. DO NOT MERGE
* commit '
6d48feaaff63b14adc23e7b2d82854189a456f15':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Apr 2011 20:51:35 +0000 (13:51 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I514527d78b0fc0ace90060441a3622c47d662df2
Jaikumar Ganesh [Tue, 26 Apr 2011 18:27:53 +0000 (11:27 -0700)]
am
16fc087d: Merge "Fixing crash in BluetoothPbapService."
* commit '
16fc087dc9dea43c436b0f98995ba0afb75119fb':
Fixing crash in BluetoothPbapService.
Jaikumar Ganesh [Tue, 26 Apr 2011 18:17:39 +0000 (11:17 -0700)]
Merge "Fixing crash in BluetoothPbapService."
Mathias Jeppsson [Tue, 26 Apr 2011 12:04:48 +0000 (14:04 +0200)]
Fixing crash in BluetoothPbapService.
If Bluetooth is turned off while there is an PBAP connect request
pending, the status bar notification or yes/no activity will not
disappear. If user selects yes, an intent will start PbapService
again. PbapService will try to make the device trusted. As this
instance of PbapService don't have any connected device, crash will
occur.
Make sure status bar notification or yes/no activity disappears, by
sending timeout intent when Bluetooth is turned off.
Also, PbapReceiver should not forward any intents except STATE_ON
if Bluetooth is off as this will start the PbapService.
Change-Id: Iee4f95ab2de34db6e00ff9b1fd7f8677947b8f4f
Jaikumar Ganesh [Thu, 14 Apr 2011 16:49:27 +0000 (09:49 -0700)]
am
138654ff: Merge "The phone did not reject unsupported vCalendar item"
* commit '
138654ff978d6fc784003f87dfb5fda46a6a3703':
The phone did not reject unsupported vCalendar item
Jaikumar Ganesh [Thu, 14 Apr 2011 16:33:43 +0000 (09:33 -0700)]
Merge "The phone did not reject unsupported vCalendar item"
Olsson [Mon, 6 Dec 2010 13:23:37 +0000 (14:23 +0100)]
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
Jaikumar Ganesh [Wed, 30 Mar 2011 03:09:08 +0000 (20:09 -0700)]
am
c298d29b: Merge "Add check for null pointer to avoid crash."
* commit '
c298d29b081e4240c80750e9431b7189d0b38513':
Add check for null pointer to avoid crash.
Jaikumar Ganesh [Wed, 30 Mar 2011 02:55:21 +0000 (19:55 -0700)]
Merge "Add check for null pointer to avoid crash."
Mathias Jeppsson [Mon, 21 Mar 2011 14:04:31 +0000 (15:04 +0100)]
Require bonding and encryption for PBAP server
The Phonebook Access Profile specification requires bonding and
encryption. For devices not supporting SSP (Secure Simple Pairing),
InsecureRfcomm will require neither. Adding EncryptedRfcomm to force
bonding and encryption but not requiring authenticated link key.
Change-Id: I987ca50ff7f60813b5311cead8d6a30a9123d54b
Eric Fischer [Fri, 18 Mar 2011 23:08:42 +0000 (16:08 -0700)]
am
ada94283: Import revised translations. DO NOT MERGE
* commit '
ada94283cbb98320b4db9d8bac9a4d1b452fc90d':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 22:12:09 +0000 (15:12 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iddb27f5a792b07f058ea99944b8a2b7b16defc31
martin ma [Mon, 6 Dec 2010 08:51:28 +0000 (16:51 +0800)]
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
Jaikumar Ganesh [Mon, 28 Feb 2011 23:54:17 +0000 (15:54 -0800)]
am
c5813a6d: Merge "Check if BT is allowed in airplane mode"
* commit '
c5813a6dcf079202d8dce16a37cbadd427804d9c':
Check if BT is allowed in airplane mode
Jaikumar Ganesh [Mon, 28 Feb 2011 23:54:15 +0000 (15:54 -0800)]
am
72d2f1d8: Merge "Handle pullVcardListing req without search value for Number attr."
* commit '
72d2f1d8b81087c0a00310ff43e5d060dc8b7867':
Handle pullVcardListing req without search value for Number attr.
Jaikumar Ganesh [Mon, 28 Feb 2011 23:54:13 +0000 (15:54 -0800)]
am
89a69665: Merge "Fix \'New Missed Calls\' count in PullvCardListing"
* commit '
89a696651197f313786842ec0e2656ea6211bfdc':
Fix 'New Missed Calls' count in PullvCardListing
Jaikumar Ganesh [Mon, 28 Feb 2011 23:26:59 +0000 (15:26 -0800)]
Merge "Check if BT is allowed in airplane mode"
Jaikumar Ganesh [Mon, 28 Feb 2011 23:26:53 +0000 (15:26 -0800)]
Merge "Handle pullVcardListing req without search value for Number attr."
Jaikumar Ganesh [Mon, 28 Feb 2011 23:26:46 +0000 (15:26 -0800)]
Merge "Fix 'New Missed Calls' count in PullvCardListing"
Eric Fischer [Tue, 1 Feb 2011 00:15:18 +0000 (16:15 -0800)]
am
d67d4059: Import revised translations. DO NOT MERGE
* commit '
d67d40591c19d2c146dca5fbf91d76d1e7c2ab82':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 31 Jan 2011 20:20:22 +0000 (12:20 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I3447cf958ca1f28c1eda610d635391c006993b4a
Yoshiharu Kurita [Fri, 7 Jan 2011 08:14:44 +0000 (09:14 +0100)]
Fix 'New Missed Calls' count in PullvCardListing
When the phone receives a PullvCardListing request about mch
(Missed Call History), PBAP application sends a corresponding
response which contains the number of 'New Missed Calls' in
the header. Currently, the number of 'New Missed Calls' is
included into a response against the other type of
PullvCardListing request after the phone receives mch
PullvCardListing request which contains MaxListCount = 0 and
ListStartOffset = 0 (these parameters mean PCE only wants the
number of index), because any of PullvCardListing requests
are miss-detected as mch in this case. And then the internal
value for 'New Missed Calls' is also updated, so the number
of 'New Missed Calls' becomes incorrect when answering the
next PullvCardListing about mch.
The solution is to fix the miss detection.
Change-Id: Ic09257fc554d8b7af9498d2ff79e017f6e56510c
Staffan Lindvall [Fri, 7 Jan 2011 08:12:06 +0000 (09:12 +0100)]
Handle pullVcardListing req without search value for Number attr.
When sending pullVcardListing request to the phone while using
the search attribute "Number" without any search value, the
phone responds with error code "internal error".
Instead the phone should return all numbers in the phonebook.
Change-Id: I7c11b76bbd61882c62be3533b1c45c2c72f497b2
Eric Fischer [Fri, 7 Jan 2011 04:30:12 +0000 (20:30 -0800)]
am
aa11beb4: Import translations for additional languages.
* commit '
aa11beb42a9f79bd18275b20baf95b800a0e01d1':
Import translations for additional languages.
Eric Fischer [Thu, 6 Jan 2011 18:30:08 +0000 (10:30 -0800)]
Import translations for additional languages.
Change-Id: Ia609288d3ec68f17d38203421bb9ddaab7ebdbde
Kevin LeBlanc [Wed, 5 Jan 2011 15:18:15 +0000 (16:18 +0100)]
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
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:56:29 +0000 (11:56 -0800)]
Merge "BT - Not possible to accept incoming obex transfers using key-presses."
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
Xiaodong Xu [Tue, 21 Dec 2010 10:52:59 +0000 (11:52 +0100)]
Bluetooth: Add vCard version support for call history.
Under current implementation, PSE only deliver call history
under format VCard2.1 to PCE, this is not correct according to
PBAP specification, which says "The PSE shall support both
vCard2.1 and vCard3.0 versions and deliver the Entries to the
PCE under the format version that is requested by the PCE."
This fix is to make implementation following such PBAP
specificaiton.
Change-Id: Id0146d0887bad3bd066109ecd3be674b3106bced
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
Wojciech Jowsa [Mon, 17 May 2010 15:02:06 +0000 (17:02 +0200)]
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>
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