OSDN Git Service
The Android Automerger [Thu, 17 May 2012 14:04:04 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Martijn Coenen [Wed, 16 May 2012 22:51:41 +0000 (15:51 -0700)]
Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev
Martijn Coenen [Wed, 16 May 2012 22:51:34 +0000 (15:51 -0700)]
Merge "Don't MediaScan files received through handover." into jb-dev
Martijn Coenen [Wed, 16 May 2012 22:51:26 +0000 (15:51 -0700)]
Merge "Add BT address and mimeType to handover intents." into jb-dev
Martijn Coenen [Wed, 16 May 2012 20:58:02 +0000 (13:58 -0700)]
Allow bluetooth OPP transfers to be stopped.
If handover requesters such as NFC want to cancel an
ongoing transfer, they can use this intent. It requires
the same permission that is used for whitelisting,
which at this point is only granted to the NFC service.
Change-Id: I89e27550d700c4a29a892dba99fda740d8845642
The Android Automerger [Wed, 16 May 2012 14:03:59 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 15 May 2012 22:47:04 +0000 (15:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I66cea0e6b7a5e9377cb77e75ac21914fbbc95de4
Martijn Coenen [Tue, 15 May 2012 21:36:06 +0000 (14:36 -0700)]
Don't MediaScan files received through handover.
Handover providers such as NFC may move the file in the filesystem
(out of /bluetooth), hence it's better not to scan them here.
Change-Id: Ic374c5ae880cb65e2d8a9ce615115b51fdc29353
Martijn Coenen [Mon, 14 May 2012 17:09:01 +0000 (10:09 -0700)]
Add BT address and mimeType to handover intents.
Also, allow refreshing whitelisted entries by sending
another whitelist intent.
Change-Id: If85db397e31364939c67b3018413b625a1888ae6
The Android Automerger [Fri, 4 May 2012 23:14:18 +0000 (16:14 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Fri, 4 May 2012 18:21:23 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9862cbb427bcb5be81af2e09cc71208c1456be05
Eric Fischer [Thu, 3 May 2012 20:08:57 +0000 (13:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie86c651cb588dec834c629a429ddee49ca51bdd5
The Android Automerger [Thu, 3 May 2012 14:15:05 +0000 (07:15 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Wed, 2 May 2012 18:30:02 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I476bff54ef18b9d35405429e0550d3e7b61971db
The Android Automerger [Wed, 2 May 2012 14:06:46 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 1 May 2012 17:49:08 +0000 (10:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I886c43f6b61b1d37e9bd92533c6f43c148e46507
The Android Automerger [Tue, 1 May 2012 14:03:51 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Mon, 30 Apr 2012 18:06:15 +0000 (11:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic54867813d76fe3c63a6d69799972730a61893eb
The Android Automerger [Mon, 30 Apr 2012 14:03:38 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Fri, 27 Apr 2012 17:59:53 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e41675842a972f1400a66cdf155e0fa7ba532f2
Eric Fischer [Thu, 26 Apr 2012 18:54:24 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia11deef3743e0d63ccbe6f8eb6e311e3f2f11f69
The Android Automerger [Thu, 26 Apr 2012 14:04:01 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Wed, 25 Apr 2012 18:05:18 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: If5a6ab133af77342121ff61d0aea40cc8626f956
The Android Automerger [Wed, 25 Apr 2012 14:48:29 +0000 (07:48 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 24 Apr 2012 18:18:52 +0000 (11:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I635726426ba283e8428bfa11abf90da16a824ae1
Martijn Coenen [Tue, 24 Apr 2012 16:03:44 +0000 (09:03 -0700)]
Merge "Additional changes to support Bluetooth Beam."
Martijn Coenen [Fri, 6 Apr 2012 20:47:52 +0000 (13:47 -0700)]
Additional changes to support Bluetooth Beam.
- Added a whitelist permission, to ensure only system
services (such as NFC) can whitelist MAC addresses.
- Added HANDOVER_STATUS permission, to ensure handover
transfer status can only be received by eligible services
(such as NFC).
- Added new confirmation type HANDOVER_CONFIRMED; this indicates
the transfer was initiated by a handover, and doesn't need to be
confirmed. This type is also reused to send broadcasts
to the NFC service, so the NFC service can show notifications
and deal with the received data.
- Added 15 second timeout to whitelist.
- Modify notication code to not show any notifications for handover
transfers; instead, send broadcasts to indicate handover status.
- Modify "transfer complete" code to sendbroasts to indicate handover
status.
Change-Id: I00c08e09eaf44f0bd4bd837cb6b0c37b802742bc
The Android Automerger [Thu, 19 Apr 2012 14:03:52 +0000 (07:03 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Wed, 18 Apr 2012 18:59:40 +0000 (11:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5cfa785854414256c441ca703ad2480f0434f6d2
The Android Automerger [Mon, 16 Apr 2012 14:04:15 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Fri, 13 Apr 2012 18:25:50 +0000 (11:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia88990b571171704ec18c0c7766cb241579b907a
The Android Automerger [Thu, 5 Apr 2012 14:04:47 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Martijn Coenen [Thu, 5 Apr 2012 01:30:27 +0000 (18:30 -0700)]
Merge "First cut at Bluetooth Beam."
Nick Pelly [Wed, 4 Apr 2012 01:10:12 +0000 (18:10 -0700)]
First cut at Bluetooth Beam.
Add Bluetooth address white-listing to avoid receive confirmation from
Beam interactions.
Change-Id: I25720c6e902c494cbb9845a30a175edad4225b89
Mike Lockwood [Tue, 3 Apr 2012 17:49:25 +0000 (10:49 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
The Android Automerger [Wed, 28 Mar 2012 14:03:32 +0000 (07:03 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Tue, 27 Mar 2012 17:57:21 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I292e4bd502c2f1569cbdb103529b7c4d6e01a52d
The Android Automerger [Mon, 26 Mar 2012 14:05:15 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Fri, 23 Mar 2012 18:25:01 +0000 (11:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3ec2408e9e4524df80d0f68d37b5376ae8f9e0f4
Eric Fischer [Wed, 21 Mar 2012 18:06:37 +0000 (11:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia20e0222899886a1a916fad99056f94083529b26
The Android Automerger [Wed, 14 Mar 2012 14:04:10 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Daniel Lehmann [Tue, 13 Mar 2012 22:51:08 +0000 (15:51 -0700)]
Merge "Use new READ_CALL_LOG permission"
Daniel Lehmann [Sat, 10 Mar 2012 04:43:54 +0000 (20:43 -0800)]
Use new READ_CALL_LOG permission
Bug:
6141864
Change-Id: I16ce32e960e2b7e4fc104b247849c4013663a90b
The Android Automerger [Thu, 8 Mar 2012 15:03:40 +0000 (07:03 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Wed, 7 Mar 2012 19:28:51 +0000 (11:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I44b61aabac36d7c7844ac298aeb68892f5b855ab
The Android Automerger [Tue, 6 Mar 2012 15:03:08 +0000 (07:03 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Mon, 5 Mar 2012 20:38:10 +0000 (12:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0d770468153cd24147eea856ba5c6ba517866203
The Android Open Source Project [Thu, 16 Feb 2012 19:25:41 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 19:25:25 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 18:14:02 +0000 (10:14 -0800)]
am
fe548d6a: Reconcile with ics-mr1-release
* commit '
fe548d6a965bfa990e1f9b291a3e526e52c5ad38':
The Android Open Source Project [Thu, 16 Feb 2012 18:10:48 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iabe8f7374f8e66b88775543fb58d075f13088cbd
The Android Open Source Project [Thu, 16 Feb 2012 18:06:46 +0000 (10:06 -0800)]
am
2fc1b62a: Reconcile with ics-mr1-release
* commit '
2fc1b62a9cacfc28fc6a8b4b1e42a1aded82ca23':
The Android Open Source Project [Thu, 16 Feb 2012 18:02:52 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie37047344c3707cc7880faa64f1b619044e21ed1
The Android Automerger [Tue, 14 Feb 2012 22:16:09 +0000 (14:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Fri, 10 Feb 2012 18:15:32 +0000 (10:15 -0800)]
am
a57e72ea: (-s ours) am
2e68425e: (-s ours) am
a167e65c: Import translations. DO NOT MERGE
* commit '
a57e72eaf40ab153ec06c51716d42102de1b311f':
Eric Fischer [Fri, 10 Feb 2012 18:15:27 +0000 (10:15 -0800)]
am
f9d3df5a: (-s ours) am
87712d44: am
a167e65c: Import translations. DO NOT MERGE
* commit '
f9d3df5a582328d90d2ba7cfd24f603b51c482c6':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:10:31 +0000 (10:10 -0800)]
am
2e68425e: (-s ours) am
a167e65c: Import translations. DO NOT MERGE
* commit '
2e68425ec2364490dc77b91c8f06b672033e00db':
Eric Fischer [Fri, 10 Feb 2012 18:08:33 +0000 (10:08 -0800)]
am
87712d44: am
a167e65c: Import translations. DO NOT MERGE
* commit '
87712d44052e90068f6aa6e021d652b21918e60b':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:07:10 +0000 (10:07 -0800)]
am
a167e65c: Import translations. DO NOT MERGE
* commit '
a167e65c90e6c58e14b697d14c992447802401b7':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
am
a167e65c: Import translations. DO NOT MERGE
* commit '
a167e65c90e6c58e14b697d14c992447802401b7':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:05:45 +0000 (10:05 -0800)]
am
a167e65c: Import translations. DO NOT MERGE
* commit '
a167e65c90e6c58e14b697d14c992447802401b7':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 02:17:45 +0000 (18:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: If4e20cdabb365ab8a53bf6ad2fcaff4220534908
The Android Open Source Project [Wed, 1 Feb 2012 18:05:53 +0000 (10:05 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:01:11 +0000 (10:01 -0800)]
am
9a38c83e: Reconcile with ics-mr1-release
* commit '
9a38c83e1757dfb33f4593243267baa938339593':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:26 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I9fda103ee8c16f7042b22e0fc6bd09be32f3f194
The Android Automerger [Mon, 30 Jan 2012 15:02:30 +0000 (07:02 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Thu, 26 Jan 2012 21:53:45 +0000 (13:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2103dd0783f7906276899fbeb8d746c003c852f5
The Android Automerger [Mon, 2 Jan 2012 15:00:18 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
Eric Fischer [Thu, 29 Dec 2011 19:54:06 +0000 (11:54 -0800)]
Import revised translations.
Change-Id: I7d31d973487f1ef6906a6c1d1b0f13f7bc4629e9
The Android Open Source Project [Fri, 9 Dec 2011 22:57:41 +0000 (14:57 -0800)]
am
19417bef: Reconcile with ics-mr1-release
* commit '
19417befca4aa6b3d55b6d23103b75ee54ff6e89':
The Android Open Source Project [Thu, 8 Dec 2011 18:22:10 +0000 (10:22 -0800)]
Reconcile with ics-mr1-release
Change-Id: I0f886881d60df0aa053f019592baa0dd1ddb9424
The Android Open Source Project [Wed, 30 Nov 2011 20:56:05 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ifa837ef35780c94b49379c9caa315ae3dc9adb93
The Android Automerger [Wed, 30 Nov 2011 15:00:37 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 30 Nov 2011 14:46:26 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Tue, 29 Nov 2011 19:45:11 +0000 (11:45 -0800)]
am
0ac98162: Read the requested file size completely.
* commit '
0ac98162ff293fdaa23f93f9839aaad5428af537':
Read the requested file size completely.
Chih-Chung Chang [Tue, 29 Nov 2011 19:43:03 +0000 (11:43 -0800)]
am
0ac98162: Read the requested file size completely.
* commit '
0ac98162ff293fdaa23f93f9839aaad5428af537':
Read the requested file size completely.
Chih-Chung Chang [Fri, 18 Nov 2011 11:14:51 +0000 (19:14 +0800)]
Read the requested file size completely.
This was causing failures while sharing pictures
from Picassa over Bluetooth.
Bug:
5632161.
Change-Id: Ieb2697513299270b2982ebc6c9f0b367adf36d3a
Eric Fischer [Tue, 29 Nov 2011 18:33:31 +0000 (10:33 -0800)]
Import revised translations.
Change-Id: I726460f3143ba47c96a9105d79a44002c3639c43
The Android Automerger [Mon, 28 Nov 2011 20:22:39 +0000 (12:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 22 Nov 2011 21:26:03 +0000 (13:26 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib3cb0799cd54228f43fa27fdf618cbcc0cea18a1
The Android Automerger [Tue, 22 Nov 2011 19:56:29 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 22 Nov 2011 05:08:15 +0000 (21:08 -0800)]
am
0e5bc336: (-s ours) Import revised translations. DO NOT MERGE
* commit '
0e5bc33617343b0e1cce4fa6300e1fe8103a4292':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 23:31:27 +0000 (15:31 -0800)]
am
0e5bc336: Import revised translations. DO NOT MERGE
* commit '
0e5bc33617343b0e1cce4fa6300e1fe8103a4292':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 22:57:31 +0000 (14:57 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I6ad8447cdf1cb726db8711f7288036c7f681da9d
The Android Open Source Project [Fri, 18 Nov 2011 23:43:30 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4f5b3197efd5b4f5b78ed2006276741a23aa501b
The Android Automerger [Thu, 17 Nov 2011 14:46:46 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 17 Nov 2011 13:45:50 +0000 (05:45 -0800)]
am
4292d313: (-s ours) Import revised translations. DO NOT MERGE
* commit '
4292d31334f90c5f7c210eb2ab7b418255ff97a0':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 19:00:51 +0000 (11:00 -0800)]
am
4292d313: Import revised translations. DO NOT MERGE
* commit '
4292d31334f90c5f7c210eb2ab7b418255ff97a0':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 18:07:53 +0000 (10:07 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I36a2d5233771fee938b896a2dfea40a3fc65ccb5
The Android Automerger [Wed, 16 Nov 2011 14:46:32 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 15 Nov 2011 21:10:54 +0000 (13:10 -0800)]
am
dfea0983: (-s ours) am
d4fd0eca: Import revised translations. DO NOT MERGE
* commit '
dfea09839f680aaeee725ac68211ab9b84463664':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 19:55:39 +0000 (11:55 -0800)]
am
dfea0983: am
d4fd0eca: Import revised translations. DO NOT MERGE
* commit '
dfea09839f680aaeee725ac68211ab9b84463664':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 19:51:40 +0000 (11:51 -0800)]
am
d4fd0eca: Import revised translations. DO NOT MERGE
* commit '
d4fd0eca9db6939853db49b06c22cf999c31deee':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Nov 2011 21:27:48 +0000 (13:27 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I2507276cf96ca69abc7bda02c8f62085470bfd16
The Android Automerger [Sun, 13 Nov 2011 15:01:12 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
Eric Fischer [Thu, 10 Nov 2011 22:06:37 +0000 (14:06 -0800)]
Merge "Import revised translations."
Eric Fischer [Thu, 10 Nov 2011 21:49:35 +0000 (13:49 -0800)]
Import revised translations.
Change-Id: Ia615a4ec462fae018ae7dc124b7f9eb03c508036
Eric Fischer [Thu, 10 Nov 2011 16:15:08 +0000 (16:15 +0000)]
am
d24c5574: (-s ours) am
2b5a552a: (-s ours) Import revised translations. DO NOT MERGE
* commit '
d24c5574cb5b23785bd1747414ef7685f63b9022':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Nov 2011 23:20:46 +0000 (23:20 +0000)]
am
d24c5574: am
2b5a552a: (-s ours) Import revised translations. DO NOT MERGE
* commit '
d24c5574cb5b23785bd1747414ef7685f63b9022':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Nov 2011 23:18:07 +0000 (23:18 +0000)]
am
2b5a552a: (-s ours) Import revised translations. DO NOT MERGE
* commit '
2b5a552a15777e350cad3cf7ccaa487b3612b1ca':
Import revised translations. DO NOT MERGE
OSDN Git Service
