OSDN Git Service
Romain Guy [Fri, 8 Jan 2010 23:07:17 +0000 (15:07 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Eric Fischer [Fri, 8 Jan 2010 00:01:26 +0000 (16:01 -0800)]
Update with latest translations.
Doug Zongker [Wed, 6 Jan 2010 23:56:48 +0000 (15:56 -0800)]
remove ACCESS_CACHE_FILESYSTEM permission
Its definition is moving to frameworks/base.
Change-Id: Ieb0409c458939c14e2cc8b5bdbcef14564a59c55
Jean-Baptiste Queru [Tue, 5 Jan 2010 19:09:54 +0000 (11:09 -0800)]
explicit set an "optional" tag
Android Git Automerger [Tue, 15 Dec 2009 08:45:09 +0000 (00:45 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Paul Westbrook [Mon, 14 Dec 2009 19:55:48 +0000 (11:55 -0800)]
am
31342163: am
dc0accaa: Changed class paths for classes moved in unbundling effort
Merge commit '
313421638f1fa01bf269350fd32d4e4df8afbc5e'
* commit '
313421638f1fa01bf269350fd32d4e4df8afbc5e':
Changed class paths for classes moved in unbundling effort
Paul Westbrook [Mon, 14 Dec 2009 18:40:55 +0000 (10:40 -0800)]
am
dc0accaa: Changed class paths for classes moved in unbundling effort
Merge commit '
dc0accaaa66cdd7321505a8c42504b05a98ae341' into eclair-mr2-plus-aosp
* commit '
dc0accaaa66cdd7321505a8c42504b05a98ae341':
Changed class paths for classes moved in unbundling effort
Paul Westbrook [Mon, 14 Dec 2009 18:25:46 +0000 (10:25 -0800)]
Changed class paths for classes moved in unbundling effort
Eric Fischer [Wed, 2 Dec 2009 01:39:37 +0000 (17:39 -0800)]
am
e88706b9: (-s ours) am
b0033a36: am
a61606af: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
e88706b900716b2cfaa917efdd320e6bef7b21fa'
* commit '
e88706b900716b2cfaa917efdd320e6bef7b21fa':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:29:57 +0000 (17:29 -0800)]
am
b0033a36: am
a61606af: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
b0033a369377c3cfba1121f7ed7941165cc1c415' into eclair-mr2-plus-aosp
* commit '
b0033a369377c3cfba1121f7ed7941165cc1c415':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:12:18 +0000 (17:12 -0800)]
am
a61606af: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a61606af5d154cd6281bd5f5de9e01e7240cca53' into eclair-mr2
* commit '
a61606af5d154cd6281bd5f5de9e01e7240cca53':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 20:06:00 +0000 (12:06 -0800)]
am
a61606af: Import revised translations. DO NOT MERGE
Merge commit '
a61606af5d154cd6281bd5f5de9e01e7240cca53' into eclair-plus-aosp
* commit '
a61606af5d154cd6281bd5f5de9e01e7240cca53':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 19:41:02 +0000 (11:41 -0800)]
Import revised translations. DO NOT MERGE
Lixin Yue [Wed, 25 Nov 2009 21:40:30 +0000 (13:40 -0800)]
am
5b9bcf8d: am
18c30402: Fix Download application notification timestamp not correct issue
Merge commit '
5b9bcf8d3f74b8827b2a2e1f148d8ccd574083c8'
* commit '
5b9bcf8d3f74b8827b2a2e1f148d8ccd574083c8':
Fix Download application notification timestamp not correct issue
Lixin Yue [Wed, 25 Nov 2009 21:37:57 +0000 (13:37 -0800)]
am
18c30402: Fix Download application notification timestamp not correct issue
Merge commit '
18c3040260907472a9e471e5707a5b2f8320d074' into eclair-mr2-plus-aosp
* commit '
18c3040260907472a9e471e5707a5b2f8320d074':
Fix Download application notification timestamp not correct issue
Lixin Yue [Mon, 2 Nov 2009 07:22:42 +0000 (15:22 +0800)]
Fix Download application notification timestamp not correct issue
Should set the value of Notification.when before calling
setLatestEventInfo(). On downloading an image without
exif information, the received file's timestamp is correct for main database field
but incorrect for temporary display field.
Root cause is that if Notification.when not set before calling setLatestEventInfo(),
the timestamp value in milliseconds unit will be directly set to a field as second
unit. Thus database will record the time as 1000 times forward as 2067, etc.
However from UI the file's time will be just shown like "10/10/67", misleading
people to think time is set backwards before system time 0(1969).
Doug Zongker [Wed, 18 Nov 2009 00:14:19 +0000 (16:14 -0800)]
am
caec636f: am
89f9c9b4: change ACCESS_CACHE_FILESYSTEM to signatureOrSystem
Merge commit '
caec636f568242f59196fec7487051d535c236e6'
* commit '
caec636f568242f59196fec7487051d535c236e6':
change ACCESS_CACHE_FILESYSTEM to signatureOrSystem
Doug Zongker [Wed, 18 Nov 2009 00:06:22 +0000 (16:06 -0800)]
am
89f9c9b4: change ACCESS_CACHE_FILESYSTEM to signatureOrSystem
Merge commit '
89f9c9b4ccc22bc1f37edf5effa518970d342808' into eclair-mr2-plus-aosp
* commit '
89f9c9b4ccc22bc1f37edf5effa518970d342808':
change ACCESS_CACHE_FILESYSTEM to signatureOrSystem
Doug Zongker [Tue, 17 Nov 2009 23:34:15 +0000 (15:34 -0800)]
change ACCESS_CACHE_FILESYSTEM to signatureOrSystem
Needed for unbundling of google OTA.
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:09:45 +0000 (15:09 -0800)]
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:28 +0000 (14:55 -0800)]
merge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:06:49 +0000 (14:06 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:07:00 +0000 (12:07 -0800)]
merge from eclair
Eric Fischer [Sat, 14 Nov 2009 02:06:30 +0000 (18:06 -0800)]
am
93c36e2c: (-s ours) am
38b7e34a: am
9d6b0fa7: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
93c36e2ca5d0f3a5a176060b945d206cf3cf5a67'
* commit '
93c36e2ca5d0f3a5a176060b945d206cf3cf5a67':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 02:02:12 +0000 (18:02 -0800)]
am
38b7e34a: am
9d6b0fa7: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
38b7e34aacd4ab7a73c26c099fe07abe6f83a9dc' into eclair-mr2-plus-aosp
* commit '
38b7e34aacd4ab7a73c26c099fe07abe6f83a9dc':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:58:09 +0000 (17:58 -0800)]
am
9d6b0fa7: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9d6b0fa777f6978be741f2b34bf36cdec8cb7a41' into eclair-mr2
* commit '
9d6b0fa777f6978be741f2b34bf36cdec8cb7a41':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:58:04 +0000 (17:58 -0800)]
am
9d6b0fa7: Import revised translations. DO NOT MERGE
Merge commit '
9d6b0fa777f6978be741f2b34bf36cdec8cb7a41' into eclair-plus-aosp
* commit '
9d6b0fa777f6978be741f2b34bf36cdec8cb7a41':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:26:25 +0000 (17:26 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:14 +0000 (18:46 -0800)]
eclair snapshot
Eric Fischer [Sat, 7 Nov 2009 00:27:52 +0000 (16:27 -0800)]
am
d438ebb0: (-s ours) am
54d20c42: Import revised translations. DO NOT MERGE
Merge commit '
d438ebb0de6fc5df12b462d7bea070c36ce39034'
* commit '
d438ebb0de6fc5df12b462d7bea070c36ce39034':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 7 Nov 2009 00:20:02 +0000 (16:20 -0800)]
am
54d20c42: Import revised translations. DO NOT MERGE
Merge commit '
54d20c42b8fe7ae73e5546a6d5810d4a87f3681e' into eclair-mr2-plus-aosp
* commit '
54d20c42b8fe7ae73e5546a6d5810d4a87f3681e':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 6 Nov 2009 23:30:20 +0000 (15:30 -0800)]
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 03:20:28 +0000 (20:20 -0700)]
am
8edb9a38: (-s ours) am
a1ed67b2: am
8dcf3cb2: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
8edb9a384ef96b4dcd3ce28e93ed1453dc2c5264'
* commit '
8edb9a384ef96b4dcd3ce28e93ed1453dc2c5264':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 03:00:17 +0000 (20:00 -0700)]
am
a1ed67b2: am
8dcf3cb2: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a1ed67b275f4fe40c3709beea583dfdff22b17c1' into eclair-mr2-plus-aosp
* commit '
a1ed67b275f4fe40c3709beea583dfdff22b17c1':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 02:25:11 +0000 (19:25 -0700)]
am
8dcf3cb2: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
8dcf3cb2c499612b42e9eeab9164d5be7c539169' into eclair-mr2
* commit '
8dcf3cb2c499612b42e9eeab9164d5be7c539169':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 06:35:16 +0000 (23:35 -0700)]
am
8dcf3cb2: Import revised translations. DO NOT MERGE
Merge commit '
8dcf3cb2c499612b42e9eeab9164d5be7c539169' into eclair-plus-aosp
* commit '
8dcf3cb2c499612b42e9eeab9164d5be7c539169':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 04:20:27 +0000 (21:20 -0700)]
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 16:47:03 +0000 (09:47 -0700)]
am
c6a96990: (-s ours) am
c7a161b7: am
0ac5c77d: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
c6a9699075a5ea1aef070a49d59aa5b5d67b4eb1'
* commit '
c6a9699075a5ea1aef070a49d59aa5b5d67b4eb1':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 16:35:40 +0000 (09:35 -0700)]
am
c7a161b7: am
0ac5c77d: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
c7a161b7d241b47cb503c6cbb4344af0ff789b6c' into eclair-mr2-plus-aosp
* commit '
c7a161b7d241b47cb503c6cbb4344af0ff789b6c':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:45:24 +0000 (06:45 -0700)]
am
0ac5c77d: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4' into eclair-mr2
* commit '
0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 18:59:07 +0000 (11:59 -0700)]
am
0ac5c77d: Import revised translations. DO NOT MERGE
Merge commit '
0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4' into eclair-plus-aosp
* commit '
0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:48:59 +0000 (10:48 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:20:21 +0000 (16:20 -0700)]
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:18 +0000 (16:02 -0700)]
merge from open-source master
Eric Fischer [Tue, 13 Oct 2009 23:45:34 +0000 (16:45 -0700)]
Reimport translations.
Change-Id: I4ba9560db97bfbaa9e40641213eddc9c0be431e1
Eric Fischer [Tue, 13 Oct 2009 19:07:11 +0000 (12:07 -0700)]
am
59563fb4: (-s ours) am
0a6d0804: (-s ours) am
aad2e29e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
59563fb4e1a51f9f15c51e15833943664ae21436'
* commit '
59563fb4e1a51f9f15c51e15833943664ae21436':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 9 Oct 2009 00:35:28 +0000 (17:35 -0700)]
am
0a6d0804: (-s ours) am
aad2e29e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0a6d08049533bdb769ca229e5205abe9545b46c6' into eclair-mr2
* commit '
0a6d08049533bdb769ca229e5205abe9545b46c6':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:15:58 +0000 (15:15 -0700)]
am
0a6d0804: am
aad2e29e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0a6d08049533bdb769ca229e5205abe9545b46c6' into eclair-plus-aosp
* commit '
0a6d08049533bdb769ca229e5205abe9545b46c6':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:02:39 +0000 (15:02 -0700)]
am
aad2e29e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
aad2e29eb56d6861c4e6672c18f03b6e00f3b9dd' into eclair
* commit '
aad2e29eb56d6861c4e6672c18f03b6e00f3b9dd':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Sep 2009 23:45:25 +0000 (16:45 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Fri, 25 Sep 2009 18:05:50 +0000 (11:05 -0700)]
Jean-Baptiste Queru [Fri, 25 Sep 2009 18:05:47 +0000 (11:05 -0700)]
am
c484c076: am
4a977a52: Re-use the same random value to compute a download\'s restart time.
Merge commit '
c484c076dd60dc42910ff07516d6bcaf36f75520'
* commit '
c484c076dd60dc42910ff07516d6bcaf36f75520':
Re-use the same random value to compute a download's restart time.
Jean-Baptiste Queru [Fri, 25 Sep 2009 18:05:44 +0000 (11:05 -0700)]
Jean-Baptiste Queru [Fri, 25 Sep 2009 15:49:31 +0000 (08:49 -0700)]
am
2f91090a: am
764844eb: Log the service being launched
Merge commit '
2f91090a489a1c48c7a92b530afbede54a99844a'
* commit '
2f91090a489a1c48c7a92b530afbede54a99844a':
Log the service being launched
Jean-Baptiste Queru [Thu, 24 Sep 2009 16:53:09 +0000 (09:53 -0700)]
am
c04b1a0c: Disable unnecessary logging
Merge commit '
c04b1a0c79631ed8804475a1c4b144686bfaab15' into eclair-plus-aosp
* commit '
c04b1a0c79631ed8804475a1c4b144686bfaab15':
Disable unnecessary logging
Jean-Baptiste Queru [Thu, 24 Sep 2009 16:53:06 +0000 (09:53 -0700)]
am
4a977a52: Re-use the same random value to compute a download\'s restart time.
Merge commit '
4a977a52c3eb3ac08b94b81aef72fb618be39f81' into eclair-plus-aosp
* commit '
4a977a52c3eb3ac08b94b81aef72fb618be39f81':
Re-use the same random value to compute a download's restart time.
Jean-Baptiste Queru [Thu, 24 Sep 2009 16:53:03 +0000 (09:53 -0700)]
am
2061c034: Remove unnecessary logging
Merge commit '
2061c03400a8e23cfeee5394b7e71db2440a48ed' into eclair-plus-aosp
* commit '
2061c03400a8e23cfeee5394b7e71db2440a48ed':
Remove unnecessary logging
Jean-Baptiste Queru [Thu, 24 Sep 2009 14:57:52 +0000 (07:57 -0700)]
Disable unnecessary logging
BUG=
2134410
Jean-Baptiste Queru [Thu, 24 Sep 2009 14:59:02 +0000 (07:59 -0700)]
Re-use the same random value to compute a download's restart time.
The restart time is used multiple times during the same pass,
and it needs to be consistent across calls. Otherwise, it's
possible for a download to not be restarted immediately and
to not be scheduled for a future restart.
BUG=
2055624
Jean-Baptiste Queru [Thu, 24 Sep 2009 15:02:04 +0000 (08:02 -0700)]
Remove unnecessary logging
Also tweak some slightly inaccurate logging, and add a note
about a potential bug.
BUG=
2055624
Jean-Baptiste Queru [Wed, 23 Sep 2009 18:37:15 +0000 (11:37 -0700)]
am
8d1b3d65: am
e2607d88: Add a bit more logging to track down network state issues.
Merge commit '
8d1b3d65527005a611e1d4c11061685dcf7f90ac'
* commit '
8d1b3d65527005a611e1d4c11061685dcf7f90ac':
Add a bit more logging to track down network state issues.
Jean-Baptiste Queru [Wed, 23 Sep 2009 14:21:15 +0000 (07:21 -0700)]
am
764844eb: Log the service being launched
Merge commit '
764844ebbb788cdde731abbacc89b9afcab8b49f' into eclair-plus-aosp
* commit '
764844ebbb788cdde731abbacc89b9afcab8b49f':
Log the service being launched
Jean-Baptiste Queru [Wed, 23 Sep 2009 01:12:59 +0000 (18:12 -0700)]
Log the service being launched
BUG=
2055624
Jean-Baptiste Queru [Tue, 22 Sep 2009 22:51:09 +0000 (15:51 -0700)]
am
e2607d88: Add a bit more logging to track down network state issues.
Merge commit '
e2607d88081f02a418ff5d5067f5327d513e00a1' into eclair-plus-aosp
* commit '
e2607d88081f02a418ff5d5067f5327d513e00a1':
Add a bit more logging to track down network state issues.
Jean-Baptiste Queru [Tue, 22 Sep 2009 22:28:36 +0000 (15:28 -0700)]
Add a bit more logging to track down network state issues.
BUG=
2055624
Jean-Baptiste Queru [Mon, 21 Sep 2009 17:22:49 +0000 (10:22 -0700)]
am
fe7029b9: am
a581a4af: Add logging to track connectivity as seen from the Download Manager.
Merge commit '
fe7029b9301e867ced0684ae307dfee34ca45761'
* commit '
fe7029b9301e867ced0684ae307dfee34ca45761':
Add logging to track connectivity as seen from the Download Manager.
Jean-Baptiste Queru [Mon, 21 Sep 2009 17:14:45 +0000 (10:14 -0700)]
am
a581a4af: Add logging to track connectivity as seen from the Download Manager.
Merge commit '
a581a4af046fd82b5854d213519e3f418047c0ba' into eclair-plus-aosp
* commit '
a581a4af046fd82b5854d213519e3f418047c0ba':
Add logging to track connectivity as seen from the Download Manager.
Jean-Baptiste Queru [Mon, 21 Sep 2009 01:51:28 +0000 (18:51 -0700)]
Add logging to track connectivity as seen from the Download Manager.
This is enabled by a separate build-time constant, so that it can
be turned on for everyone without having to use a system property.
BUG=
2055624
Eric Fischer [Thu, 17 Sep 2009 22:23:12 +0000 (15:23 -0700)]
am
bd7e7b80: (-s ours) am
7dd04503: Import revised translations. DO NOT MERGE
Merge commit '
bd7e7b808d5c7a1b385386fd89fab3be60b4b81f'
* commit '
bd7e7b808d5c7a1b385386fd89fab3be60b4b81f':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 22:15:30 +0000 (15:15 -0700)]
am
7dd04503: Import revised translations. DO NOT MERGE
Merge commit '
7dd04503e767637c0e4f1b4517f613c8b0c79024' into eclair-plus-aosp
* commit '
7dd04503e767637c0e4f1b4517f613c8b0c79024':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:37:26 +0000 (14:37 -0700)]
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Sep 2009 17:58:10 +0000 (10:58 -0700)]
am
ab05c91f: (-s ours) am
1a397667: Import revised translations. DO NOT MERGE
Merge commit '
ab05c91fb2a0ac2723a8ac38503f1710f32811e5'
* commit '
ab05c91fb2a0ac2723a8ac38503f1710f32811e5':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Sep 2009 00:11:02 +0000 (17:11 -0700)]
am
1a397667: Import revised translations. DO NOT MERGE
Merge commit '
1a39766751288d3c8d3bd06c812493315067262f' into eclair-plus-aosp
* commit '
1a39766751288d3c8d3bd06c812493315067262f':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Sep 2009 23:32:45 +0000 (16:32 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Fri, 4 Sep 2009 18:06:35 +0000 (11:06 -0700)]
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:28 +0000 (07:51 -0700)]
merge from open-source master
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:17 +0000 (14:13 -0700)]
merge from donut
Eric Fischer [Fri, 28 Aug 2009 20:41:26 +0000 (13:41 -0700)]
Eric Fischer [Fri, 28 Aug 2009 00:26:16 +0000 (17:26 -0700)]
DO NOT MERGE: Cherry-picked
5761e46f88aa2f216d8d22288435c497153931c7 from master branch
Armor string format tokens with translation placeholders.
Android (Google) Code Review [Fri, 28 Aug 2009 20:33:40 +0000 (13:33 -0700)]
Merge change 23033
* changes:
Armor string format tokens with translation placeholders.
Eric Fischer [Fri, 28 Aug 2009 20:21:04 +0000 (13:21 -0700)]
Eric Fischer [Thu, 27 Aug 2009 20:53:48 +0000 (13:53 -0700)]
DO NOT MERGE: cherry-picked
28a3d53eca1fedf9b6ad5513db4bc1834e9d92fa from master branch
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Eric Fischer [Fri, 28 Aug 2009 00:26:16 +0000 (17:26 -0700)]
Armor string format tokens with translation placeholders.
Change-Id: I39f5b8edf8af4fe5469ae42275dade1b753f696a
Eric Fischer [Thu, 27 Aug 2009 20:53:48 +0000 (13:53 -0700)]
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Change-Id: Iea17b7daafd5f04d3c3e82f21862c6c326595f14
Tom Taylor [Tue, 11 Aug 2009 17:28:10 +0000 (10:28 -0700)]
Add INSTALL_DRM permission
Add new permission to install drm into DrmProvider.
Tom Taylor [Fri, 7 Aug 2009 19:32:49 +0000 (12:32 -0700)]
Revert "Add new the INSERTL_DRM to the Downloader so it can install DRM content."
This reverts commit
f0728f890008a9fe7a79ffdbc30cd3388ce130fc.
Tom Taylor [Fri, 24 Jul 2009 23:46:48 +0000 (16:46 -0700)]
Add new the INSERTL_DRM to the Downloader so it can install DRM content.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:30 +0000 (09:00 -0700)]
merge from open-source master
Eric Fischer [Tue, 4 Aug 2009 00:06:19 +0000 (17:06 -0700)]
am
89d4bc91: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
89d4bc914ba0250e8d7a3c216e466799a985dd16'
* commit '
89d4bc914ba0250e8d7a3c216e466799a985dd16':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:30:42 +0000 (16:30 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:07 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:56 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 03:44:56 +0000 (20:44 -0700)]
Merge korg/donut into korg/master
Conflicts:
src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/Helpers.java
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:13:14 +0000 (17:13 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master
Jean-Baptiste Queru [Tue, 14 Jul 2009 22:53:03 +0000 (15:53 -0700)]
am
d3403254: Enable full logging (for easier debugging)
Merge commit '
d3403254c3a290b6a68804c36c6876cb3787ec15'
* commit '
d3403254c3a290b6a68804c36c6876cb3787ec15':
Enable full logging (for easier debugging)
Jean-Baptiste Queru [Tue, 14 Jul 2009 22:11:48 +0000 (15:11 -0700)]
Enable full logging (for easier debugging)
See http://b/
1973844
Eric Fischer [Tue, 14 Jul 2009 04:41:43 +0000 (21:41 -0700)]
Eric Fischer [Mon, 13 Jul 2009 22:54:37 +0000 (15:54 -0700)]
Import new translations
Jean-Baptiste Queru [Mon, 6 Jul 2009 17:42:56 +0000 (10:42 -0700)]
Merge commit '
f0fa1cdc' into manualmerge
Fix crash in discardPurgeableFiles with proper selection syntax.
The basic crash is that this codepath was doing a query to the download
provider without properly quoting its selection arguments (which is
mandated by the download provider).
A secondary crash is that the DESTINATION column wasn't readable.
This fixes bug
1941125.
Tested by force-calling discardPurgeableFiles for each download
to /cache, locally adding a few debugging statements to be sure
that the codepath was getting executed, and doing a market download.
Conflicts:
src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/Helpers.java
Jean-Baptiste Queru [Wed, 1 Jul 2009 22:27:28 +0000 (15:27 -0700)]
Fix crash in discardPurgeableFiles with proper selection syntax.
The basic crash is that this codepath was doing a query to the download
provider without properly quoting its selection arguments (which is
mandated by the download provider).
A secondary crash is that the DESTINATION column wasn't readable.
This fixes bug
1941125.
Tested by force-calling discardPurgeableFiles for each download
to /cache, locally adding a few debugging statements to be sure
that the codepath was getting executed, and doing a market download.
OSDN Git Service
