OSDN Git Service

android-x86/packages-apps-Bluetooth.git
13 years agocode cleanup.
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

13 years agocode cleanup.
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

14 years agoSend vCard with Unicode encoded Strings over BT
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

14 years agoPullvCardList 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

14 years agoImport revised translations
Kenny Root [Mon, 21 Jun 2010 18:04:14 +0000 (11:04 -0700)]
Import revised translations

Change-Id: Ia0887bd64eafcb3a3ef329b84805a2859cde44eb

14 years agoImport revised translations
Kenny Root [Mon, 21 Jun 2010 01:56:36 +0000 (18:56 -0700)]
Import revised translations

Change-Id: I5351f0f604a561458f284c0e9444d5aec7767733

14 years agoImport revised translations
Kenny Root [Thu, 10 Jun 2010 05:26:43 +0000 (22:26 -0700)]
Import revised translations

Change-Id: I118b7e54616b1144be81c8e9ea5de04efb388a97

14 years agoImport revised translations
Kenny Root [Mon, 17 May 2010 18:23:51 +0000 (11:23 -0700)]
Import revised translations

Change-Id: Ic96221d5e692ef4089ef4db39bcfedc392e6d321

14 years agoRun 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

14 years agoAdd missing moveToNext() calling.
David Yue [Tue, 11 May 2010 03:08:05 +0000 (11:08 +0800)]
Add missing moveToNext() calling.

Bug: 2674275
Change-Id: Ib5f5d2ebe3ff6ab02e43df38097a89541e132b55

14 years agoImport revised translations
Kenny Root [Tue, 27 Apr 2010 19:19:00 +0000 (12:19 -0700)]
Import revised translations

Change-Id: I70a15978fd77c45efd8a4e6478c98ee953c49a99

14 years agoMake BluetoothPbapCallLogComposer use FLAG_REFRAIN_IMAGE_EXPORT.
Daisuke Miyakawa [Tue, 20 Apr 2010 01:27:31 +0000 (10:27 +0900)]
Make BluetoothPbapCallLogComposer use FLAG_REFRAIN_IMAGE_EXPORT.

Bug: 2603200
Change-Id: Ie6a40c12fafac5927b616f31a8335df0181f9e18

14 years agoClear notifications when the user presses clear from the notifications bar.
Lixin Yue [Fri, 26 Mar 2010 01:27:20 +0000 (09:27 +0800)]
Clear notifications when the user presses clear from the notifications bar.

Bug: 2542260
Change-Id: I00f9d8216d70543b93cfbcdb2cd8da8331044d77

14 years agoFix pbap and opp running bluetooth in phone process problems.
Jaikumar Ganesh [Wed, 24 Mar 2010 17:36:06 +0000 (10:36 -0700)]
Fix pbap and opp running bluetooth in phone process problems.

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

Change-Id: Ib50c63c271dd8b30108f22734c47ee8645cd4839

14 years agoFix Typo.
Jaikumar Ganesh [Thu, 18 Mar 2010 22:40:19 +0000 (15:40 -0700)]
Fix Typo.

Change-Id: Ia71a5b3bb970463132b2c25b90cf3897fc227fb9

14 years agoMerge "Add ABORT request handling to PBAP"
Jaikumar Ganesh [Thu, 18 Mar 2010 21:34:53 +0000 (14:34 -0700)]
Merge "Add ABORT request handling to PBAP"

14 years agoImport revised translations
Kenny Root [Thu, 18 Mar 2010 05:06:03 +0000 (22:06 -0700)]
Import revised translations

Change-Id: Ia703afd0c3fd603a68f606b684bdf76cd2de32fe

14 years agoAdd ability to run Bluetooth application in a different process if needed.
Jaikumar Ganesh [Thu, 11 Mar 2010 21:06:54 +0000 (13:06 -0800)]
Add ability to run Bluetooth application in a different process if needed.

Change-Id: I5fa328f2b8fd78986b9a1958e5899feca254f316

14 years agoMerge "Enhanced support to OPP content share"
Jaikumar Ganesh [Thu, 18 Mar 2010 00:21:42 +0000 (17:21 -0700)]
Merge "Enhanced support to OPP content share"

14 years agoEnhanced support to OPP content share
Lixin Yue [Fri, 12 Mar 2010 09:32:50 +0000 (17:32 +0800)]
Enhanced support to OPP content share

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

Change-Id: I9a93eb0891d0f670109afd44ab4064f7f15b01f3

14 years agoMerge "Update notification in Transfer history manually when BT if off"
Jaikumar Ganesh [Wed, 17 Mar 2010 22:05:06 +0000 (15:05 -0700)]
Merge "Update notification in Transfer history manually when BT if off"

14 years agooptimize deleting operation in trimDatabase()
Lixin Yue [Fri, 12 Mar 2010 14:15:01 +0000 (22:15 +0800)]
optimize deleting operation in trimDatabase()

14 years agoAdd ABORT request handling to PBAP
Lixin Yue [Tue, 16 Mar 2010 01:41:12 +0000 (09:41 +0800)]
Add ABORT request handling to PBAP

14 years agoUpdate notification in Transfer history manually when BT if off
Lixin Yue [Mon, 15 Mar 2010 02:45:42 +0000 (10:45 +0800)]
Update notification in Transfer history manually when BT if off

14 years agoMerge "Trim Opp database when service restarts."
Jaikumar Ganesh [Wed, 10 Mar 2010 20:05:05 +0000 (12:05 -0800)]
Merge "Trim Opp database when service restarts."

14 years agoTrim Opp database when service restarts.
Lixin Yue [Wed, 3 Mar 2010 09:54:33 +0000 (17:54 +0800)]
Trim Opp database when service restarts.

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

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

Change-Id: If27080721d9abed025162ff805f661fde01564d3

14 years agoMerge "Not update TransferActivity button during activity creating."
Jaikumar Ganesh [Wed, 10 Mar 2010 01:30:47 +0000 (17:30 -0800)]
Merge "Not update TransferActivity button during activity creating."

14 years agoNot update TransferActivity button during activity creating.
Lixin Yue [Tue, 9 Mar 2010 04:48:23 +0000 (12:48 +0800)]
Not update TransferActivity button during activity creating.

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

Change-Id: Ibfe363f3822386a38b9b108e29f60ad6673f70f6

14 years agoAdd an empty CleanSpec.mk
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:55 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk

Change-Id: I3cdd8eee24082d0b0bf63d1bb80102cf8093b265

14 years agoRemove the number above status icon for Opp transfers
Lixin Yue [Fri, 5 Mar 2010 07:11:06 +0000 (15:11 +0800)]
Remove the number above status icon for Opp transfers

14 years agoImport new translations
Eric Fischer [Thu, 4 Mar 2010 22:03:45 +0000 (14:03 -0800)]
Import new translations

14 years agoMerge "Add opp Transfer history to avoid cluster of notificatoins To reduce the clust...
Michael Chan [Thu, 4 Mar 2010 03:14:35 +0000 (19:14 -0800)]
Merge "Add opp Transfer history to avoid cluster of notificatoins To reduce the cluster of Opp nofications, we introduce the concept of Opp transfer history. Only 2 notifications exist for finished opp transfers, one is for outbound transfers, and another is for inbound transfers. User can see all detailed items in corresponding screen when click the notification."

14 years agoAdd opp Transfer history to avoid cluster of notificatoins To reduce the cluster...
Lixin Yue [Fri, 26 Feb 2010 09:35:23 +0000 (17:35 +0800)]
Add opp Transfer history to avoid cluster of notificatoins To reduce the cluster of Opp nofications, we introduce the concept of Opp transfer history. Only 2 notifications exist for finished opp transfers, one is for outbound transfers, and another is for inbound transfers. User can see all detailed items in corresponding screen when click the notification.

Change-Id: Iffed353ea6b0d7c958c71fe8d3996937058ced30

14 years agoAdd missing addHandler().
Daisuke Miyakawa [Thu, 4 Mar 2010 01:33:20 +0000 (10:33 +0900)]
Add missing addHandler().

Bug: 2485875

14 years agoImport new translations.
Eric Fischer [Sat, 27 Feb 2010 01:27:11 +0000 (17:27 -0800)]
Import new translations.

14 years agoMove Pbap logic to Bluetooth package so that we do not have unnecessary tight coupling.
Daisuke Miyakawa [Tue, 23 Feb 2010 06:55:19 +0000 (15:55 +0900)]
Move Pbap logic to Bluetooth package so that we do not have unnecessary tight coupling.

14 years agoRemoved Unused Strings and resources to reduce image size.
Jaikumar Ganesh [Tue, 23 Feb 2010 18:17:44 +0000 (10:17 -0800)]
Removed Unused Strings and resources to reduce image size.

Bug: 2456698

14 years agoAdd an original-package tag that matches the real package name.
Jeff Hamilton [Thu, 11 Feb 2010 22:25:47 +0000 (16:25 -0600)]
Add an original-package tag that matches the real package name.

Change-Id: I96a9ed96420c20f9291e004a2d9e02300d53ff26

14 years agoam 0341ac9a: am 8916d261: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 22:17:41 +0000 (14:17 -0800)]
am 0341ac9a: am 8916d261: reconcile main tree with open-source eclair

Merge commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2'

* commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2':
  android-2.1_r1 snapshot

14 years agoam 8916d261: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:46:16 +0000 (08:46 -0800)]
am 8916d261: reconcile main tree with open-source eclair

Merge commit '8916d261ab985d191999ec9f8751819434ec4cc0' into eclair-plus-aosp

* commit '8916d261ab985d191999ec9f8751819434ec4cc0':
  android-2.1_r1 snapshot

14 years agoreconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair

14 years agoreconcile android-2.1_r1 snapshot
The Android Open Source Project [Fri, 29 Jan 2010 22:09:21 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot

14 years agoam ac1140f7: merge from open-source master
The Android Open Source Project [Thu, 28 Jan 2010 00:15:20 +0000 (16:15 -0800)]
am ac1140f7: merge from open-source master

Merge commit 'ac1140f71690c537a0a318446731611341e163b8'

* commit 'ac1140f71690c537a0a318446731611341e163b8':
  empty initial commit

14 years agomerge from open-source master
The Android Open Source Project [Thu, 21 Jan 2010 19:21:26 +0000 (11:21 -0800)]
merge from open-source master

14 years agoandroid-2.1_r1 snapshot
The Android Open Source Project [Tue, 12 Jan 2010 23:19:08 +0000 (15:19 -0800)]
android-2.1_r1 snapshot

14 years agoempty initial commit
The Android Open Source Project [Mon, 11 Jan 2010 22:32:51 +0000 (14:32 -0800)]
empty initial commit

14 years agoDeprecate fill_parent and introduce match_parent.
Romain Guy [Fri, 8 Jan 2010 23:06:41 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.

14 years agoUpdate with latest translations.
Eric Fischer [Thu, 7 Jan 2010 23:56:15 +0000 (15:56 -0800)]
Update with latest translations.

14 years agoDo not use a user tag on apps, as it is ignored.
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

14 years agoMove insert share info operation to a thread to avoid Receiver timeout
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.

14 years agoFix non-existing received file still appearing in live folder issue
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.

14 years agoUpdate the error codes to be compatible with PBAP spec.
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().

14 years agoEnable vcard share in OPP
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

14 years agoam 1b079725: (-s ours) am e381d79d: am da4092ba: (-s ours) Import revised translation...
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

14 years agoam e381d79d: am da4092ba: (-s ours) 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

14 years agoam da4092ba: (-s ours) 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

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 01:24:28 +0000 (17:24 -0800)]
Import revised translations.  DO NOT MERGE

14 years agoam 11bac503: am 6414394c: am 6ee2d0e0: Fix Opp notifications timestamp not correct...
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

14 years agoam 6414394c: am 6ee2d0e0: 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

14 years agoam 6ee2d0e0: 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

14 years agoam 5e95999a: am 019188fd: Merge change Ifb8562d3 into eclair-mr2
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

14 years agoam 019188fd: Merge change Ifb8562d3 into eclair-mr2
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

14 years agoMerge change Ifb8562d3 into eclair-mr2
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

14 years agoFix Opp notifications timestamp not correct issue
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

14 years agoAdd a few specific file type support
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

14 years agoam 5a591d7c: am 975bc7ee: am 03f598ba: Catch all exceptions while trying to send...
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.

14 years agoam 975bc7ee: am 03f598ba: 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.

14 years agoam 03f598ba: 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.

14 years agoCatch 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

14 years agoam 4370c42a: (-s ours) am c17872fc: am 3238ec15: (-s ours) Import revised translation...
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

14 years agoam dd0279d5: am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair
Eric Fischer [Tue, 17 Nov 2009 15:36:07 +0000 (07:36 -0800)]
am dd0279d5: am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair

Merge commit 'dd0279d592788cfa0d88398c0d946c34a3affa37'

* commit 'dd0279d592788cfa0d88398c0d946c34a3affa37':

14 years agoam c17872fc: am 3238ec15: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoam 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair
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':

14 years agoam 3238ec15: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 Nov 2009 00:44:36 +0000 (16:44 -0800)]
Import revised translations.  DO NOT MERGE

14 years agoam 37c35377: merge from open-source master
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

14 years agomerge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:23 +0000 (14:55 -0800)]
merge from open-source master

14 years agoam 46979a81: (-s ours) Merge change I37f3fff6 into eclair
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

14 years agoMerge change I37f3fff6 into eclair
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

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

14 years agoam 5dc084a9: am 39a9c98e: Merge change I8b791d4f into eclair
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.

14 years agoam 39a9c98e: Merge change I8b791d4f into eclair
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.

14 years agoMerge change I8b791d4f into eclair
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.

14 years agoam 9fa06d17: (-s ours) am 765403ef: (-s ours) Import revised translations. DO NOT...
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

14 years agoDon't send default phone number for 0.vcf card.
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

14 years agoam 765403ef: (-s ours) Import revised translations. DO NOT MERGE
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

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

14 years agoam 8eabbf92: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 6 Nov 2009 23:26:01 +0000 (15:26 -0800)]
Import revised translations.  DO NOT MERGE

14 years agoam 5ce62e92: am cd5ed0c7: PBAP only transfer contacts that are visible in contacts...
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.

14 years agoam cd5ed0c7: 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.

14 years agoPBAP 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

14 years agoam ae7f7056: am 2b36e173: Fix get contact size not correct issue.
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.

14 years agoam 2b36e173: 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.

14 years agoam 757c85e4: (-s ours) am c065fc55: (-s ours) Disable sending Photo field for PBAP...
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.

14 years agoam c065fc55: (-s ours) 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.

14 years agoFix get contact size not correct issue.
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

14 years agoam 31cea05f: Merge change I51d7be27 into eclair-mr2
Daisuke Miyakawa [Mon, 2 Nov 2009 05:58:41 +0000 (21:58 -0800)]
am 31cea05f: Merge change I51d7be27 into eclair-mr2

Merge commit '31cea05f854d0f7b9be07472d85128cc0f44e85a'

* commit '31cea05f854d0f7b9be07472d85128cc0f44e85a':
  Fix a typo.

14 years agoam e10881ae: Fix a typo.
Daisuke Miyakawa [Mon, 2 Nov 2009 05:58:36 +0000 (21:58 -0800)]
am e10881ae: Fix a typo.

Merge commit 'e10881ae39eb4affb7a78827f2060964e8534515'

* commit 'e10881ae39eb4affb7a78827f2060964e8534515':
  Fix a typo.

14 years agoMerge change I51d7be27 into eclair-mr2
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.