OSDN Git Service

android-x86/packages-apps-Bluetooth.git
13 years agoam e7df5087: Merge "Handle OBEX Abort packets sent from remote device"
Jaikumar Ganesh [Tue, 7 Jun 2011 20:23:00 +0000 (13:23 -0700)]
am e7df5087: Merge "Handle OBEX Abort packets sent from remote device"

* commit 'e7df508750728dc2bbd7729d54673bf16f7688c3':
  Handle OBEX Abort packets sent from remote device

13 years agoam a2407587: Merge "Require bonding and encryption for PBAP server"
Jaikumar Ganesh [Mon, 6 Jun 2011 19:27:30 +0000 (12:27 -0700)]
am a2407587: Merge "Require bonding and encryption for PBAP server"

* commit 'a2407587440d487aa0171638eef29526515fde59':
  Require bonding and encryption for PBAP server

13 years agoMerge "Handle OBEX Abort packets sent from remote device"
Jaikumar Ganesh [Wed, 1 Jun 2011 16:20:48 +0000 (09:20 -0700)]
Merge "Handle OBEX Abort packets sent from remote device"

13 years agoHandle 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>
13 years agoMerge "Require bonding and encryption for PBAP server"
Jaikumar Ganesh [Thu, 26 May 2011 03:22:58 +0000 (20:22 -0700)]
Merge "Require bonding and encryption for PBAP server"

13 years agoam d8a9af40: Merge "BT: Fix for vCard Listing error"
Jaikumar Ganesh [Fri, 20 May 2011 22:09:56 +0000 (15:09 -0700)]
am d8a9af40: Merge "BT: Fix for vCard Listing error"

* commit 'd8a9af404413ad060eb4aa29a32370b44e61327e':
  BT: Fix for vCard Listing error

13 years agoMerge "BT: Fix for vCard Listing error"
Jaikumar Ganesh [Fri, 20 May 2011 21:55:21 +0000 (14:55 -0700)]
Merge "BT: Fix for vCard Listing error"

13 years agoam 7aa5a581: am 88fd05d3: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 21:29:35 +0000 (14:29 -0700)]
am 7aa5a581: am 88fd05d3: (-s ours) Import revised translations.  DO NOT MERGE

* commit '7aa5a581f0d6631a9af5cac4f27da5479b8bc4e1':
  Import revised translations.  DO NOT MERGE

13 years agoam 88fd05d3: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 21:22:57 +0000 (14:22 -0700)]
am 88fd05d3: (-s ours) Import revised translations.  DO NOT MERGE

* commit '88fd05d3dd5eedcd37da293f97a43c3eb31feb19':
  Import revised translations.  DO NOT MERGE

13 years agoam d7b9a76a: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 19:25:56 +0000 (12:25 -0700)]
am d7b9a76a: Import revised translations.  DO NOT MERGE

* commit 'd7b9a76a5ce4dcc7203fa8765b657ce13e12b2a2':
  Import revised translations.  DO NOT MERGE

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 9 May 2011 23:51:45 +0000 (16:51 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Iac56f615976d5b29b29a3278482939d0ea53f5fe

13 years agoam 4da2545c: am f6dace4a: Merge "Bluetooth: Add vCard version support for call history."
Conley Owens [Sat, 30 Apr 2011 00:52:49 +0000 (17:52 -0700)]
am 4da2545c: am f6dace4a: Merge "Bluetooth: Add vCard version support for call history."

* commit '4da2545c8543c7ba4729f63c86a38008309ec870':
  Bluetooth: Add vCard version support for call history.

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 29 Apr 2011 20:59:19 +0000 (13:59 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I89cc42e5b6283f8c632b23c40596bc1a4bb3413c

13 years agoam f6dace4a: Merge "Bluetooth: Add vCard version support for call history."
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.

13 years agoMerge "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."

13 years agoam 189e3bec: (-s ours) am 6d48feaa: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 28 Apr 2011 17:26:11 +0000 (10:26 -0700)]
am 189e3bec: (-s ours) am 6d48feaa: Import revised translations.  DO NOT MERGE

* commit '189e3becc9b494f25a11484a842ea150be116a42':
  Import revised translations.  DO NOT MERGE

13 years agoBT: Fix for vCard Listing error
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>
13 years agoam 6d48feaa: Import revised translations. DO NOT MERGE
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

13 years agoImport 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

13 years agoam a96efa27: am 16fc087d: Merge "Fixing crash in BluetoothPbapService."
Jaikumar Ganesh [Tue, 26 Apr 2011 18:42:57 +0000 (11:42 -0700)]
am a96efa27: am 16fc087d: Merge "Fixing crash in BluetoothPbapService."

* commit 'a96efa270cf215602b0ab1f3603c24aadff808da':
  Fixing crash in BluetoothPbapService.

13 years agoam 16fc087d: Merge "Fixing crash in BluetoothPbapService."
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.

13 years agoMerge "Fixing crash in BluetoothPbapService."
Jaikumar Ganesh [Tue, 26 Apr 2011 18:17:39 +0000 (11:17 -0700)]
Merge "Fixing crash in BluetoothPbapService."

13 years agoFixing 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

13 years agoam d9945336: am 624517c2: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 18 Apr 2011 10:17:31 +0000 (03:17 -0700)]
am d9945336: am 624517c2: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'd994533643ae793ef983155b3ede633d219d1237':
  Import revised translations.  DO NOT MERGE

13 years agoam 624517c2: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 15 Apr 2011 19:44:22 +0000 (12:44 -0700)]
am 624517c2: (-s ours) Import revised translations.  DO NOT MERGE

* commit '624517c2bba1aa85d026072510943cb9567ca164':
  Import revised translations.  DO NOT MERGE

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:00:17 +0000 (14:00 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I9e79fc9d62787d9d79d67a49c4291f768225cf49

13 years agoam 3c68bca8: am 138654ff: Merge "The phone did not reject unsupported vCalendar item"
Jaikumar Ganesh [Thu, 14 Apr 2011 17:05:15 +0000 (10:05 -0700)]
am 3c68bca8: am 138654ff: Merge "The phone did not reject unsupported vCalendar item"

* commit '3c68bca80f40710b70e3f9173cea167b30a8dcb4':
  The phone did not reject unsupported vCalendar item

13 years agoam 138654ff: Merge "The phone did not reject unsupported vCalendar item"
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

13 years agoMerge "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"

13 years agoThe 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

13 years agoam 5c580cbc: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 21:16:09 +0000 (14:16 -0700)]
am 5c580cbc: Import revised translations.  DO NOT MERGE

* commit '5c580cbcf1a2c10c9e0b42f299df481e9a0bfc84':
  Import revised translations.  DO NOT MERGE

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 20:49:01 +0000 (13:49 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I80a2af164c1436888d946961956c4896e7a085e6

13 years agoam a4f55f77: am c298d29b: Merge "Add check for null pointer to avoid crash."
Jaikumar Ganesh [Wed, 30 Mar 2011 16:40:53 +0000 (09:40 -0700)]
am a4f55f77: am c298d29b: Merge "Add check for null pointer to avoid crash."

* commit 'a4f55f7702bca57c0dbb543ee3e2cb1686e616fc':
  Add check for null pointer to avoid crash.

13 years agoam c298d29b: Merge "Add check for null pointer to avoid crash."
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.

13 years agoMerge "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."

13 years agoam 62b1401e: am 85683ad9: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:19:09 +0000 (14:19 -0700)]
am 62b1401e: am 85683ad9: (-s ours) Import revised translations.  DO NOT MERGE

* commit '62b1401efd9b8e6d4d686da110db5b5a48f19676':
  Import revised translations.  DO NOT MERGE

13 years agoam 85683ad9: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 21:07:00 +0000 (14:07 -0700)]
am 85683ad9: (-s ours) Import revised translations.  DO NOT MERGE

* commit '85683ad9a7ec55f92ad7840a60eadddbdda77f08':
  Import revised translations.  DO NOT MERGE

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Mar 2011 20:27:12 +0000 (13:27 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I737163bd4c69d491227d7bb163d34219852c8525

13 years agoRequire bonding and encryption for PBAP server
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

13 years agoam e92baf94: (-s ours) am ada94283: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 23:50:25 +0000 (16:50 -0700)]
am e92baf94: (-s ours) am ada94283: Import revised translations.  DO NOT MERGE

* commit 'e92baf9466a26ea83d2b4f59b2b232b9fc641bd8':
  Import revised translations.  DO NOT MERGE

13 years agoam ada94283: Import revised translations. DO NOT MERGE
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

13 years agoImport 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

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Mar 2011 23:40:33 +0000 (15:40 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I9f181ff46c8dfe67e859eff9e55327cef576e8f9

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 4 Mar 2011 21:41:04 +0000 (13:41 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: Ib5e3d6782bfbaec686c1df3a5bfe029f976a62c2

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 3 Mar 2011 22:06:21 +0000 (14:06 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: Ibdd6c8b84db0e30b7f333e9c656265f428bab7a7

13 years agoam 546cd75f: am 78c1c0ee: am c5813a6d: Merge "Check if BT is allowed in airplane...
Jaikumar Ganesh [Tue, 1 Mar 2011 18:59:25 +0000 (10:59 -0800)]
am 546cd75f: am 78c1c0ee: am c5813a6d: Merge "Check if BT is allowed in airplane mode"

* commit '546cd75ff46beb4fbf07f572b968b330c9dc5cee':
  Check if BT is allowed in airplane mode

13 years agoam 2abac73f: am 69eca7b7: am 72d2f1d8: Merge "Handle pullVcardListing req without...
Jaikumar Ganesh [Tue, 1 Mar 2011 18:59:09 +0000 (10:59 -0800)]
am 2abac73f: am 69eca7b7: am 72d2f1d8: Merge "Handle pullVcardListing req without search value for Number attr."

* commit '2abac73f9babf24702f94a0428b8d7f9201c4757':
  Handle pullVcardListing req without search value for Number attr.

13 years agoam 5d08ec3f: am d66fc8a9: am 89a69665: Merge "Fix \'New Missed Calls\' count in Pullv...
Jaikumar Ganesh [Tue, 1 Mar 2011 18:59:07 +0000 (10:59 -0800)]
am 5d08ec3f: am d66fc8a9: am 89a69665: Merge "Fix \'New Missed Calls\' count in PullvCardListing"

* commit '5d08ec3f563803231ae5e775acd044e91b217047':
  Fix 'New Missed Calls' count in PullvCardListing

13 years agoam 78c1c0ee: am c5813a6d: Merge "Check if BT is allowed in airplane mode"
Jaikumar Ganesh [Tue, 1 Mar 2011 17:13:06 +0000 (09:13 -0800)]
am 78c1c0ee: am c5813a6d: Merge "Check if BT is allowed in airplane mode"

* commit '78c1c0eee41a1b6c6a259661d62d62d78841ad1f':
  Check if BT is allowed in airplane mode

13 years agoam 69eca7b7: am 72d2f1d8: Merge "Handle pullVcardListing req without search value...
Jaikumar Ganesh [Tue, 1 Mar 2011 17:13:04 +0000 (09:13 -0800)]
am 69eca7b7: am 72d2f1d8: Merge "Handle pullVcardListing req without search value for Number attr."

* commit '69eca7b7e77cb55f92b3eafd09f15be5644c3a4f':
  Handle pullVcardListing req without search value for Number attr.

13 years agoam d66fc8a9: am 89a69665: Merge "Fix \'New Missed Calls\' count in PullvCardListing"
Jaikumar Ganesh [Tue, 1 Mar 2011 17:13:02 +0000 (09:13 -0800)]
am d66fc8a9: am 89a69665: Merge "Fix \'New Missed Calls\' count in PullvCardListing"

* commit 'd66fc8a97924a5af8212d1b398011d2076d6c2cd':
  Fix 'New Missed Calls' count in PullvCardListing

13 years agoAdd check for null pointer to avoid crash.
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

13 years agoam c5813a6d: Merge "Check if BT is allowed in airplane mode"
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

13 years agoam 72d2f1d8: Merge "Handle pullVcardListing req without search value for Number attr."
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.

13 years agoam 89a69665: Merge "Fix \'New Missed Calls\' count in PullvCardListing"
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

13 years agoMerge "Check if BT is allowed in airplane mode"
Jaikumar Ganesh [Mon, 28 Feb 2011 23:26:59 +0000 (15:26 -0800)]
Merge "Check if BT is allowed in airplane mode"

13 years agoMerge "Handle pullVcardListing req without search value for Number attr."
Jaikumar Ganesh [Mon, 28 Feb 2011 23:26:53 +0000 (15:26 -0800)]
Merge "Handle pullVcardListing req without search value for Number attr."

13 years agoMerge "Fix 'New Missed Calls' count in PullvCardListing"
Jaikumar Ganesh [Mon, 28 Feb 2011 23:26:46 +0000 (15:26 -0800)]
Merge "Fix 'New Missed Calls' count in PullvCardListing"

13 years agoRetry rfcomm socket connections after link key exchange error.
Jaikumar Ganesh [Sat, 8 Jan 2011 02:15:50 +0000 (18:15 -0800)]
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

13 years agoMerge "Import revised translations."
Eric Fischer [Thu, 24 Feb 2011 22:03:35 +0000 (14:03 -0800)]
Merge "Import revised translations."

13 years agoImport revised translations.
Eric Fischer [Thu, 24 Feb 2011 19:54:28 +0000 (11:54 -0800)]
Import revised translations.

Change-Id: I221a4829a2e4de58110acd4657b6333b3e31eab4

13 years agoam f3288cc1: (-s ours) am 74a63860: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 24 Feb 2011 19:24:29 +0000 (11:24 -0800)]
am f3288cc1: (-s ours) am 74a63860: Import revised translations.  DO NOT MERGE

* commit 'f3288cc14c4f3bc50ad2b0d137a7ca375f631b5c':
  Import revised translations.  DO NOT MERGE

13 years agoam 74a63860: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 24 Feb 2011 19:18:52 +0000 (11:18 -0800)]
am 74a63860: Import revised translations.  DO NOT MERGE

* commit '74a6386000e2ee82ef7f533b4d56a5f68972cbe5':
  Import revised translations.  DO NOT MERGE

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 24 Feb 2011 18:51:49 +0000 (10:51 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I72dda3fe3c968e8af4348c99a630f4b312d7bf0b

13 years agoImport revised translations.
Eric Fischer [Thu, 17 Feb 2011 18:15:36 +0000 (10:15 -0800)]
Import revised translations.

Change-Id: Ib40d6f9835ef2025200b300f4e46a85a33598960

13 years agoCheck if BT is allowed in airplane mode
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

13 years agoHandle pullVcardListing req without search value for Number attr.
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

13 years agoam 665e977c: (-s ours) am e904e836: Import revised translations. DO NOT MERGE. ...
Eric Fischer [Tue, 1 Feb 2011 02:37:49 +0000 (18:37 -0800)]
am 665e977c: (-s ours) am e904e836: Import revised translations.  DO NOT MERGE.  Bug 3394542

* commit '665e977c3af5367dc978762ac4a07259f066c7a2':
  Import revised translations.  DO NOT MERGE.  Bug 3394542

13 years agoam e904e836: Import revised translations. DO NOT MERGE. Bug 3394542
Eric Fischer [Tue, 1 Feb 2011 02:32:04 +0000 (18:32 -0800)]
am e904e836: Import revised translations.  DO NOT MERGE.  Bug 3394542

* commit 'e904e836da640e34d334d09b4b1f8cedd24553ce':
  Import revised translations.  DO NOT MERGE.  Bug 3394542

13 years agoam 84fa4385: (-s ours) am 49283ea8: (-s ours) am d67d4059: Import revised translation...
Eric Fischer [Tue, 1 Feb 2011 02:11:29 +0000 (18:11 -0800)]
am 84fa4385: (-s ours) am 49283ea8: (-s ours) am d67d4059: Import revised translations. DO NOT MERGE

* commit '84fa438510467de6b9dce9a633ffdd9ae7efab8b':
  Import revised translations. DO NOT MERGE

13 years agoam 49283ea8: (-s ours) am d67d4059: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Feb 2011 00:19:13 +0000 (16:19 -0800)]
am 49283ea8: (-s ours) am d67d4059: Import revised translations. DO NOT MERGE

* commit '49283ea87f6b66d641206dacfe6a3bba0942b551':
  Import revised translations. DO NOT MERGE

13 years agoam d67d4059: Import revised translations. DO NOT MERGE
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

13 years agoImport revised translations. DO NOT MERGE. Bug 3394542
Eric Fischer [Mon, 31 Jan 2011 20:42:11 +0000 (12:42 -0800)]
Import revised translations.  DO NOT MERGE.  Bug 3394542

Change-Id: I91290d6460a47760f369b01d732da1bcde21e3e3

13 years agoImport 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

13 years agoReconcile gingerbread-plus-aosp and honeycomb
The Android Open Source Project [Sun, 30 Jan 2011 20:41:10 +0000 (12:41 -0800)]
Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ia3c640aac588937979c2adf597f692e95a239819

13 years agoMass merge from gingerbread - do not merge
The Android Open Source Project [Sun, 30 Jan 2011 20:41:10 +0000 (12:41 -0800)]
Mass merge from gingerbread - do not merge

Change-Id: Iaa45284ab43b861aa704076779b43434fa70b378

13 years agoam 9613628e: Merge "Remove redundant translations." into honeycomb
Dianne Hackborn [Thu, 27 Jan 2011 01:37:16 +0000 (17:37 -0800)]
am 9613628e: Merge "Remove redundant translations." into honeycomb

* commit '9613628e48cb303a4c715918d70cc3aa45408e27':
  Remove redundant translations.

13 years agoMerge "Remove redundant translations." into honeycomb
Dianne Hackborn [Thu, 27 Jan 2011 01:34:14 +0000 (17:34 -0800)]
Merge "Remove redundant translations." into honeycomb

13 years agoRemove redundant translations.
Eric Fischer [Thu, 27 Jan 2011 00:48:10 +0000 (16:48 -0800)]
Remove redundant translations.

Change-Id: I700e1fccf2db854af54353145ef82b1bc4418df6

13 years agoam 1ed96d52: Implement "show received files" intent for Settings.
Jake Hamby [Wed, 26 Jan 2011 22:17:35 +0000 (14:17 -0800)]
am 1ed96d52: Implement "show received files" intent for Settings.

* commit '1ed96d522298e8f48690a4f4cbf2e0c6b402e3a0':
  Implement "show received files" intent for Settings.

13 years agoImplement "show received files" intent for Settings.
Jake Hamby [Wed, 26 Jan 2011 03:46:26 +0000 (19:46 -0800)]
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

13 years agoam c313dd80: Cannot cancel files transfer shared using Bluetooth.
Jaikumar Ganesh [Wed, 26 Jan 2011 18:04:10 +0000 (10:04 -0800)]
am c313dd80: Cannot cancel files transfer shared using Bluetooth.

* commit 'c313dd80229d7889c10983907d34c34af54e6089':
  Cannot cancel files transfer shared using Bluetooth.

13 years agoCannot cancel files transfer shared using Bluetooth.
Jaikumar Ganesh [Wed, 26 Jan 2011 17:53:12 +0000 (09:53 -0800)]
Cannot cancel files transfer shared using Bluetooth.

If these views are clickable, the parent view doesn't get the events and you
can't click on the notification.
Bug:3173077

Change-Id: I1e293e2f6d16081b78c430dd61da35ad1a24f8bc

13 years agoam aa11beb4: (-s ours) Import translations for additional languages.
Eric Fischer [Tue, 25 Jan 2011 20:52:54 +0000 (12:52 -0800)]
am aa11beb4: (-s ours) Import translations for additional languages.

* commit 'aa11beb42a9f79bd18275b20baf95b800a0e01d1':
  Import translations for additional languages.

13 years agoam 6af09a60: (-s ours) am aa11beb4: Import translations for additional languages.
Eric Fischer [Tue, 11 Jan 2011 22:56:33 +0000 (14:56 -0800)]
am 6af09a60: (-s ours) am aa11beb4: Import translations for additional languages.

* commit '6af09a604d2bd0ee7ab4fe0bcf20086d956f86a1':
  Import translations for additional languages.

13 years agoMerge "Fix 'New Missed Calls' count in PullvCardListing" into honeycomb
Jaikumar Ganesh [Tue, 11 Jan 2011 17:30:52 +0000 (09:30 -0800)]
Merge "Fix 'New Missed Calls' count in PullvCardListing" into honeycomb

13 years agoFix 'New Missed Calls' count in PullvCardListing
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

13 years agoConvert dialogs to holographic style.
Jaikumar Ganesh [Mon, 10 Jan 2011 23:21:53 +0000 (15:21 -0800)]
Convert dialogs to holographic style.

Change-Id: If0fccab3d47c875f76bd6658c957e294bab28001

13 years agoFix 'New Missed Calls' count in PullvCardListing
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

13 years agoHandle pullVcardListing req without search value for Number attr.
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

13 years agoam aa11beb4: Import translations for additional languages.
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.

13 years agoImport some unabbreviated translations for large screens.
Eric Fischer [Fri, 7 Jan 2011 01:37:44 +0000 (17:37 -0800)]
Import some unabbreviated translations for large screens.

Change-Id: Ie0bc128f485bc80c0251ca80855d4d04290e656a

13 years agoImport 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

13 years agoCheck if BT is allowed in airplane mode
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

13 years agoam 3500d1cc: Merge "BT - Not possible to accept incoming obex transfers using key...
Jean-Baptiste Queru [Tue, 28 Dec 2010 20:04:50 +0000 (12:04 -0800)]
am 3500d1cc: Merge "BT - Not possible to accept incoming obex transfers using key-presses."

* commit '3500d1cc714807945b1427e43eb3bde367849e43':
  BT - Not possible to accept incoming obex transfers using key-presses.

13 years agoMerge "BT - Not possible to accept incoming obex transfers using key-presses."
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."

13 years agoam cbb50b68: Merge "Incorrect response code after pull of invalid vCard handle."
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:54:25 +0000 (11:54 -0800)]
am cbb50b68: Merge "Incorrect response code after pull of invalid vCard handle."

* commit 'cbb50b684e181f78d3ca5b304e97f9c5a67809b6':
  Incorrect response code after pull of invalid vCard handle.

13 years agoam 89186622: Merge "Sanitise Bluetooth file name hint when receiving a contact"
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:54:22 +0000 (11:54 -0800)]
am 89186622: Merge "Sanitise Bluetooth file name hint when receiving a contact"

* commit '89186622fa240083a46336a9e5e4ade52c5698d9':
  Sanitise Bluetooth file name hint when receiving a contact

13 years agoMerge "Incorrect response code after pull of invalid vCard handle."
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:36:02 +0000 (11:36 -0800)]
Merge "Incorrect response code after pull of invalid vCard handle."

13 years agoIncorrect 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