OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Jaikumar Ganesh [Wed, 4 Nov 2009 23:20:34 +0000 (15:20 -0800)]
am
ae7f7056: am
2b36e173: Fix get contact size not correct issue.
Merge commit '
ae7f70563660d02d56365092fa27f195b54d5d15'
* commit '
ae7f70563660d02d56365092fa27f195b54d5d15':
Fix get contact size not correct issue.
Jaikumar Ganesh [Wed, 4 Nov 2009 23:09:40 +0000 (15:09 -0800)]
am
2b36e173: Fix get contact size not correct issue.
Merge commit '
2b36e1731eb5ed784abc1a374eb69d8523123df1' into eclair-mr2
* commit '
2b36e1731eb5ed784abc1a374eb69d8523123df1':
Fix get contact size not correct issue.
Jaikumar Ganesh [Tue, 3 Nov 2009 00:05:09 +0000 (16:05 -0800)]
am
757c85e4: (-s ours) am
c065fc55: (-s ours) Disable sending Photo field for PBAP. Do Not Merge.
Merge commit '
757c85e4ce37336dbd549718fbf09a1b36ae4da5'
* commit '
757c85e4ce37336dbd549718fbf09a1b36ae4da5':
Disable sending Photo field for PBAP. Do Not Merge.
Jaikumar Ganesh [Mon, 2 Nov 2009 23:54:28 +0000 (15:54 -0800)]
am
c065fc55: (-s ours) Disable sending Photo field for PBAP. Do Not Merge.
Merge commit '
c065fc5530cc0e8f14261f8c347984cdde070169' into eclair-mr2
* commit '
c065fc5530cc0e8f14261f8c347984cdde070169':
Disable sending Photo field for PBAP. Do Not Merge.
Jaikumar Ganesh [Fri, 30 Oct 2009 18:32:36 +0000 (11:32 -0700)]
Fix get contact size not correct issue.
Call history handles should be ordered by "date DESC" per spec. The first
handle 1.vcf should be the most recently happend call.
Add order support for pullVcardListing reqeust:
One typical use case for PBAP is: first use pullVcardListing request to
display the contacts list, then use pullVcardEntry request to tirgger
the selected contact vcard. In such case, we need keep the contact db
query consistent for pullVcardListing and pullVcardEntry.
Use "Own number" for phone owner number instead of "Unknown name" in case
can not get the name from system.
Original Change: Fan Jackson
Dr No: Eastham
Bug Id:
2183320
Daisuke Miyakawa [Mon, 2 Nov 2009 05:58:41 +0000 (21:58 -0800)]
Daisuke Miyakawa [Mon, 2 Nov 2009 05:58:36 +0000 (21:58 -0800)]
Android (Google) Code Review [Mon, 2 Nov 2009 02:12:51 +0000 (21:12 -0500)]
Merge change I51d7be27 into eclair-mr2
* changes:
Fix a typo.
Daisuke Miyakawa [Mon, 2 Nov 2009 01:42:10 +0000 (10:42 +0900)]
Fix a typo.
Daisuke Miyakawa [Mon, 2 Nov 2009 01:42:10 +0000 (10:42 +0900)]
Fix a typo.
Jaikumar Ganesh [Fri, 30 Oct 2009 21:37:21 +0000 (14:37 -0700)]
Disable sending Photo field for PBAP. Do Not Merge.
Some car kits don't handle contacts with Photo Fields well.
Disable this field for the time being.
Original Change by: Yue Lixin
Bug:
2183320
Dr No: Eastham
Eric Fischer [Thu, 22 Oct 2009 16:46:31 +0000 (09:46 -0700)]
am
d74a0f97: (-s ours) am
99232162: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
d74a0f978908797aab90190ad243e0ee8f42a04d'
* commit '
d74a0f978908797aab90190ad243e0ee8f42a04d':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:47:01 +0000 (06:47 -0700)]
am
99232162: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
992321621151fb0c6d8784c3009472a29f0c6a89' into eclair-mr2
* commit '
992321621151fb0c6d8784c3009472a29f0c6a89':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:42:33 +0000 (10:42 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Daisuke Miyakawa [Thu, 15 Oct 2009 04:05:24 +0000 (21:05 -0700)]
Daisuke Miyakawa [Thu, 15 Oct 2009 03:53:41 +0000 (20:53 -0700)]
Fix a build breakage.
Make Bluetooth code use new type instead of old.
Eric Fischer [Wed, 14 Oct 2009 00:17:47 +0000 (17:17 -0700)]
am
19b9dd3e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
19b9dd3e31e2e7deff759506f9442b08426b91d7'
* commit '
19b9dd3e31e2e7deff759506f9442b08426b91d7':
Import revised translations. DO NOT MERGE
Daisuke Miyakawa [Wed, 14 Oct 2009 00:02:50 +0000 (17:02 -0700)]
am
4ceaa3e0: Adapt to the new interface of vCard code.
Merge commit '
4ceaa3e03dc7a68d4e7c0c8e14a461cfd7c4c19c'
* commit '
4ceaa3e03dc7a68d4e7c0c8e14a461cfd7c4c19c':
Adapt to the new interface of vCard code.
Eric Fischer [Tue, 13 Oct 2009 23:55:35 +0000 (16:55 -0700)]
am
da9ca291: (-s ours) am
5b61241c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
da9ca2915b56dc964ce1e4e53c0cd9085a3c7ea4'
* commit '
da9ca2915b56dc964ce1e4e53c0cd9085a3c7ea4':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Oct 2009 23:30:57 +0000 (16:30 -0700)]
Reimport translations.
Change-Id: Ib613aca3ba7ad0ab906210da90f28699ec96d5dd
Eric Fischer [Tue, 13 Oct 2009 23:04:40 +0000 (16:04 -0700)]
Import revised translations. DO NOT MERGE
Daisuke Miyakawa [Mon, 12 Oct 2009 20:30:57 +0000 (13:30 -0700)]
Adapt to the new interface of vCard code.
Internal Issue number:
2160039
Eric Fischer [Fri, 9 Oct 2009 23:27:11 +0000 (16:27 -0700)]
am
5b61241c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
5b61241c90be1a30d18fe6da116edc16d0ea1b1e' into eclair-mr2
* commit '
5b61241c90be1a30d18fe6da116edc16d0ea1b1e':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 9 Oct 2009 22:35:02 +0000 (15:35 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Android (Google) Code Review [Thu, 8 Oct 2009 23:33:56 +0000 (19:33 -0400)]
Merge change I428bc0fc into eclair
* changes:
Remove STOPSHIP BT logging.
Nick Pelly [Thu, 8 Oct 2009 23:00:55 +0000 (01:00 +0200)]
Remove STOPSHIP BT logging.
Do not merge.
Change-Id: I428bc0fc67030f24112f2e9c865824dfaea4897d
DrNo: eastham
Bug:
2089423
Joke: Why does E.T. have such big eyes? Because he saw his phone bill.
Jaikumar Ganesh [Thu, 8 Oct 2009 14:16:27 +0000 (07:16 -0700)]
Update PBAP code for Contacts database changes and check for OPP
file extension.
Original Author for PBAP - Yue Lixin
Dr No: Eastham
Bug:
2174759
Nick Pelly [Wed, 7 Oct 2009 22:57:45 +0000 (00:57 +0200)]
Update application code for BluetoothAdapter.getDefaultAdapter().
Change-Id: I7baafb909b74783da4e51d48f2465e7aacf07eb5
DrNo: eastham
Bug:
2158765
Joke: What goes 99-thump, 99-thump? A centipede with a wooden leg.
Android (Google) Code Review [Mon, 5 Oct 2009 16:42:43 +0000 (12:42 -0400)]
Merge change I773ca65d into eclair
* changes:
Remove Disconnected and Connected PBAP toasts.
Jaikumar Ganesh [Mon, 5 Oct 2009 10:43:49 +0000 (03:43 -0700)]
Remove Disconnected and Connected PBAP toasts.
Original Author: Fan Jackson
Bug number:
2060933
Dr No: Eastham
Dianne Hackborn [Sun, 4 Oct 2009 20:33:24 +0000 (13:33 -0700)]
Work on issue #
2163789: Way too much logging
Dr.No from mcleron.
Change-Id: I1a0475bebcb7e38ae4859c18afe9d5b093544e09
Android (Google) Code Review [Fri, 2 Oct 2009 07:58:20 +0000 (03:58 -0400)]
Merge change I196e84e5 into eclair
* changes:
More icons
Mike Cleron [Fri, 2 Oct 2009 07:33:14 +0000 (00:33 -0700)]
More icons
Jaikumar Ganesh [Fri, 2 Oct 2009 00:02:30 +0000 (17:02 -0700)]
Fix ANR by repeating BT ON/OFF caused by PBAP closeservice deadlock
Move back socket closing sequence ahead of Thread.shutdown and join operation;
Seperate socket closing and resetting as null to avoid NPE during service close
Original Author: Fan Jackson
Bug:
2158262
DrNo: Paul
Change-Id: I2b36f3fb920c80602f5734a67a8cf6c6fbd00de4
Android (Google) Code Review [Wed, 30 Sep 2009 18:20:05 +0000 (14:20 -0400)]
Merge change I3d0e5c00 into eclair
* changes:
Placeholder mdpi assets
Daisuke Miyakawa [Wed, 30 Sep 2009 18:15:05 +0000 (11:15 -0700)]
Remove redundant dependency toward android.syncml.
Mike Cleron [Wed, 30 Sep 2009 18:01:23 +0000 (11:01 -0700)]
Placeholder mdpi assets
Android (Google) Code Review [Wed, 30 Sep 2009 16:29:36 +0000 (12:29 -0400)]
Merge change I8222c790 into eclair
* changes:
Update OPP/PBAP service to use onStartCommand() Adjust function call seqence in PBAP closeService
Lixin Yue [Tue, 29 Sep 2009 08:29:47 +0000 (16:29 +0800)]
Update OPP/PBAP service to use onStartCommand()
Adjust function call seqence in PBAP closeService
Mike Cleron [Wed, 30 Sep 2009 08:09:18 +0000 (01:09 -0700)]
Newer icons
Android (Google) Code Review [Wed, 30 Sep 2009 04:35:44 +0000 (00:35 -0400)]
Merge change I60a29b85 into eclair
* changes:
New hdpi assets.
Daniel Sandler [Wed, 30 Sep 2009 04:33:55 +0000 (00:33 -0400)]
New hdpi assets.
Drop dated 29-Sep-2009.
Change-Id: I60a29b855fd8c259e16408006a5a3c5cf768dc7d
Lixin Yue [Tue, 29 Sep 2009 05:57:36 +0000 (13:57 +0800)]
Update OPP/PBAP UI
Add timeout handling to incoming file confirm dialog, to avoid uncertain
behavior when timeout happen
Fix PBAP request timeout issue when open/close slider, dismiss timeout
dialog to avoid uncertain behavior
Fix typo in strings
Android (Google) Code Review [Tue, 29 Sep 2009 20:14:13 +0000 (16:14 -0400)]
Merge change Iae70ee2e into eclair
* changes:
New icons
Mike Cleron [Tue, 29 Sep 2009 20:03:26 +0000 (13:03 -0700)]
New icons
Android (Google) Code Review [Tue, 29 Sep 2009 01:54:50 +0000 (21:54 -0400)]
Merge change I18bde766 into eclair
* changes:
Update PBAP to make compatiable with spec
Lixin Yue [Sun, 27 Sep 2009 05:03:16 +0000 (13:03 +0800)]
Update PBAP to make compatiable with spec
Add check to incoming application parameter, be nice to accept PCE request
Fix minor pullvCardEntry issue for call logs
Fix one pullPhoneBook issue about request size
Android (Google) Code Review [Mon, 28 Sep 2009 21:10:56 +0000 (17:10 -0400)]
Merge change Ifb946935 into eclair
* changes:
Added WhiteList of acceptable MIME types for OBEX transfers. Part of OBEX/OPP security review. Bug information: http://b/issue?id=
1972237
Oscar Montemayor [Mon, 28 Sep 2009 20:53:34 +0000 (13:53 -0700)]
Added WhiteList of acceptable MIME types for OBEX transfers. Part of OBEX/OPP security review.
Bug information: http://b/issue?id=
1972237
Nick Pelly [Mon, 28 Sep 2009 19:27:29 +0000 (12:27 -0700)]
Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Change-Id: Ia0eb46d9bdff6a8ab3333bb0ad1f66d0303c135a
Oscar Montemayor [Sun, 27 Sep 2009 20:24:54 +0000 (13:24 -0700)]
Proposed file canonical path prevetion for directory trasvesal attacks. Fix suggested by meder@google.com.
More fixes form CR comments.
Lixin Yue [Thu, 24 Sep 2009 07:28:11 +0000 (15:28 +0800)]
Update PBAP to use new VCardComposer
Totally removed the use of old syncml.pim.vcard.VCardComposer
Tao Liejun [Mon, 21 Sep 2009 12:43:57 +0000 (20:43 +0800)]
Use new SDP API for OPP
Use new API BluetoothDevice.fetchUuidsWithSdp() to query SDP for un-paired device, and request SDP
update when Opp is not in cache.
Handle a concurrent case when incoming connection and file share happens together
Some other minor changes
Change-Id: I7ebf34801518867553551d8f7bba7ac62e22667e
Android (Google) Code Review [Thu, 24 Sep 2009 01:27:06 +0000 (21:27 -0400)]
Merge change 26736 into eclair
* changes:
Update opp/pbap look and feel
Rich Cannings [Wed, 23 Sep 2009 21:33:17 +0000 (14:33 -0700)]
Fixes NullPointerException that crashes Bluetooth when filename ends end with slash, e.g.: 'fooo..txt/'.
choosefilename() can return null. We should handle this result and grecefully fail.
Lixin Yue [Mon, 21 Sep 2009 12:36:16 +0000 (20:36 +0800)]
Update opp/pbap look and feel
Update OPP BtEnabling Dialog-add timeout handling, handle Bluetooth ON intent, handle back key
Change-Id: I3d3ade3a9a4de645ddb7195e8b81ca42afb3d31e
Oscar Montemayor [Mon, 21 Sep 2009 23:07:43 +0000 (16:07 -0700)]
Replaced back-slashes on hint path URI with forward-slahes, more in line with Linux FS conventions.
Code review changes incorporated patch set 3 rev.
Roy West [Sun, 20 Sep 2009 23:46:58 +0000 (16:46 -0700)]
Fix build -- unescaped apostrophes in strings...
Roy West [Sun, 20 Sep 2009 22:48:40 +0000 (15:48 -0700)]
Edit Bluetooth strings for bug1999173.
Jaikumar Ganesh [Wed, 2 Sep 2009 19:13:06 +0000 (12:13 -0700)]
Change handling of remoteUuids.
Jaikumar Ganesh [Fri, 11 Sep 2009 23:20:52 +0000 (16:20 -0700)]
Fix incoming file transfer dialog look and feel.
Nick Pelly [Fri, 11 Sep 2009 18:46:59 +0000 (11:46 -0700)]
Update AndroidManifest.xml for Bluetooth API changes.
There was a regression with the Bluetooth API changes because I forgot to update
the manifests. Bluetooth.apk would have missed the BT on/off intents.
Change-Id: Ida94411d73826d6ff6a95c3370d8d2d49a8ab20e
Nick Pelly [Thu, 10 Sep 2009 00:47:15 +0000 (17:47 -0700)]
Update application for Bluetooth API changes.
Change-Id: I618553f2aa4e8705e3dff1247752e5fc357ef94d
Nick Pelly [Wed, 9 Sep 2009 00:50:21 +0000 (17:50 -0700)]
Update application for Bluetooth API change: deprecation of BluetoothError.
Nick Pelly [Tue, 8 Sep 2009 23:22:09 +0000 (16:22 -0700)]
Update application for Bluetooth API change.
Lixin Yue [Wed, 9 Sep 2009 05:22:51 +0000 (13:22 +0800)]
Update PBAP to be compatible with Mecel stack
The response to the targeted connect operation should contain a Who with the same UUID as
sent in the request's matching Target header. If the Who header was present in the request,
a Target header identifying the same client should be sent in the response.
Play ringtone for incoming PBAP connection request
Lixin Yue [Mon, 31 Aug 2009 10:18:18 +0000 (18:18 +0800)]
Pbap update
Improve PBAP download contacts performance greatly
Add 10 times retry for creation of listening socket
Change PbapReciever to be clearer
Rename functions and adjust function sequence in PbapService
Cleanup logging
Remove unused functions
Remove serversocket polling
Android (Google) Code Review [Tue, 1 Sep 2009 21:56:51 +0000 (14:56 -0700)]
Merge change 23495 into eclair
* changes:
Workaround bug in Poloroid Pogo.
Nick Pelly [Tue, 1 Sep 2009 20:46:01 +0000 (13:46 -0700)]
Workaround bug in Poloroid Pogo.
Rename extra dots to underscores.
Working with Poloroid to get an updated list of affected MAC addresses. For now
we just have 00:04:48.
Lixin Yue [Wed, 26 Aug 2009 14:21:21 +0000 (22:21 +0800)]
Allow Pbap if device is trusted
Tao Liejun [Mon, 31 Aug 2009 02:48:23 +0000 (10:48 +0800)]
Cleanup Opp debug code
Stop Rfcomm polling
Delete a few unused functions
Tao Liejun [Thu, 27 Aug 2009 14:34:41 +0000 (22:34 +0800)]
Simplify wakelock release for Obex Server
Daniel Sandler [Fri, 28 Aug 2009 18:51:55 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for Bluetooth.
Nick Pelly [Fri, 28 Aug 2009 01:42:51 +0000 (18:42 -0700)]
Clean up Logging.
Use the pattern if (V) Log.v(...); for logging. The Android style prefers curly braces, but for log lines it is ok to use a one-liner to keep the code manageable.
Remove spaces from some log tags, and rename TAG BluetoothShareProvider to BluetoothOpp.
Rename LOGVV to V, and LOGV to D.
Just before ship we will change Constants.DEBUG and Constants.VERBOSE to false to compile out all the logging code.
Tao Liejun [Wed, 19 Aug 2009 12:58:42 +0000 (20:58 +0800)]
Remove Device picker
Tao Liejun [Fri, 7 Aug 2009 07:01:24 +0000 (15:01 +0800)]
OPP update
Rewrite provider permission to allow LiveFolders work
Support file:// uri to share file
Support multiple share from gallery
Fully support sending file queue
Hold incoming connection for a while when OPP is busy instead of reject directly
Move notification update to a thread
Handle many error cases to display correct error messages
Improve server/client timeout
Delete empty file after reject incoming file
Support upper case incoming file extension
Avoid multiple mediascanner connections
Nick Pelly [Fri, 7 Aug 2009 01:28:28 +0000 (18:28 -0700)]
Bluetooth: Update Bluetooth.apk to match BT API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.
BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).
L.X.YUE [Thu, 13 Aug 2009 02:16:59 +0000 (10:16 +0800)]
Update Opp icons
Update incomming file notification icon to be consistent with system;
Update OPP launcher icon per Anroid guidline;
Tao Liejun [Tue, 4 Aug 2009 09:41:43 +0000 (17:41 +0800)]
Fix a few OPP issues
Grab wakelock for server session
Fix send small file bug
Android (Google) Code Review [Thu, 6 Aug 2009 03:33:16 +0000 (20:33 -0700)]
Merge change 20085
* changes:
Update PBAP per review comments:
Lixin Yue [Tue, 28 Jul 2009 02:45:23 +0000 (10:45 +0800)]
Update PBAP per review comments:
Patch 3 fix listing call-history issue
Remove the use of Enum in PbapObexServer.java
Simplify codes by using function and paras
Change some informal usage in codes
Fix minor issues
Rename some function and vars
Jaikumar Ganesh [Tue, 4 Aug 2009 20:37:42 +0000 (13:37 -0700)]
Set LOCAL_MODULE_TAG for packages/app/Bluetooth to user like other apps.
Jackson Fan [Mon, 27 Jul 2009 07:58:22 +0000 (15:58 +0800)]
Enable Opp Livefolder, modify localizable resource
Update on patchset 2
Update icon for Bluetooth share and Incoming file
Fix minor Opp UI issue
Update log print for mimetype got from android system.
Update return response code for un-supported media type
Patchset 1
remove the use of replace() of localizable resource
Enable Opp Livefolder by using local certificate
Reject vcard actively
Jackson Fan [Thu, 23 Jul 2009 22:26:23 +0000 (06:26 +0800)]
Remove TODOs for frameworks change
Modify for aidl added in frameworks
Jaikumar Ganesh [Thu, 23 Jul 2009 21:10:53 +0000 (14:10 -0700)]
Disable verbose logging.
TODO: We need to fix logging according to new verbose logging in OPP and PBAP.
Jaikumar Ganesh [Thu, 23 Jul 2009 20:32:03 +0000 (13:32 -0700)]
Add copyright and fix some style issues.
Jackson Fan [Sun, 19 Jul 2009 04:25:14 +0000 (12:25 +0800)]
Add pbap into bluetooth package
Update PBAP as patchset 5
Adjust some resouces strings after UI test
Change localized resource usage
Modify exception handle, rename a confusing variable name
Remove compile dependency on 240 for now. Add TODO in code
Some minor changes to address the comments
Submit on-behalf of Yue Lixin <a5206c@motorola.com>
Update PBAP as patchset 4 according to comments
Format resource files
Re-organize the logs
Submit on-behalf of Jiafa Liu <pbx376@motorola.com>
Jaikumar Ganesh [Fri, 17 Jul 2009 23:55:42 +0000 (16:55 -0700)]
Rename cancelPin to cancelPairingUserInput for Bluetooth 2.1
Jackson Fan [Wed, 15 Jul 2009 06:03:39 +0000 (14:03 +0800)]
Cleanup resources of OPP
Modify according to Ranian's comments
- adjust layout
- remove Capitalized resource names
- format
Tao Liejun [Thu, 16 Jul 2009 00:53:24 +0000 (17:53 -0700)]
Fix OPP receive bug
Fix the bug that second receving would fail
Show display name instead of full name in notification
Tao Liejun [Tue, 14 Jul 2009 22:55:04 +0000 (15:55 -0700)]
Make opp compile
Modify to make opp application compliable in new git
-change package name
-change manifest
-modify a few comments
Nick Pelly [Sat, 11 Jul 2009 01:45:13 +0000 (18:45 -0700)]
Initial drop of Motorola Bluetooth OPP code.
Minor changes from Moto code:
- Added Motorola BSD license
- Moved com.motorola.bluetoothshare to com.android.bluetooth.opp
- Updated com.motorola.obex to javax.obex
- Moved Android.mk to Android.mk.hide: does not yet compile due to changes in
Obex library.
The Android Open Source Project [Fri, 10 Jul 2009 23:43:41 +0000 (16:43 -0700)]
new project, first commit