OSDN Git Service
Dmitri Plotnikov [Thu, 3 Dec 2009 02:09:59 +0000 (18:09 -0800)]
am
bbdba641: Merge change Icae1a990 into eclair-mr2
Merge commit '
bbdba6414ff4adccad2a56195c8c144f7e3a025a' into eclair-mr2-plus-aosp
* commit '
bbdba6414ff4adccad2a56195c8c144f7e3a025a':
Adding NAME_RAW_CONTACT_ID column to Contacts.
Mathias Agopian [Thu, 3 Dec 2009 02:09:22 +0000 (18:09 -0800)]
am
96dac84b: am
121a31ac: Merge change Id86beb99 into eclair
Merge commit '
96dac84be4143d83b13648045b9af31ac0f81004' into eclair-mr2-plus-aosp
* commit '
96dac84be4143d83b13648045b9af31ac0f81004':
fix [
2291418] Camera preview cannot work in Emulator
Android (Google) Code Review [Thu, 3 Dec 2009 01:55:39 +0000 (17:55 -0800)]
Merge change Icae1a990 into eclair-mr2
* changes:
Adding NAME_RAW_CONTACT_ID column to Contacts.
Mike Lockwood [Thu, 3 Dec 2009 01:51:09 +0000 (17:51 -0800)]
am
f72fb68b: resolved conflicts for merge of
9b7dba93 to eclair-mr2
Merge commit '
f72fb68bf32014b075fe577c8495c2c8a86476a9' into eclair-mr2-plus-aosp
* commit '
f72fb68bf32014b075fe577c8495c2c8a86476a9':
Implement new notification LED blinking logic:
Mathias Agopian [Thu, 3 Dec 2009 01:50:45 +0000 (17:50 -0800)]
am
121a31ac: Merge change Id86beb99 into eclair
Merge commit '
121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-mr2
* commit '
121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
fix [
2291418] Camera preview cannot work in Emulator
Android (Google) Code Review [Thu, 3 Dec 2009 01:09:46 +0000 (17:09 -0800)]
Merge change Id86beb99 into eclair
* changes:
fix [
2291418] Camera preview cannot work in Emulator
Mike Lockwood [Thu, 3 Dec 2009 00:57:33 +0000 (19:57 -0500)]
resolved conflicts for merge of
9b7dba93 to eclair-mr2
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
Dianne Hackborn [Thu, 3 Dec 2009 00:29:54 +0000 (16:29 -0800)]
am
2d8b0c3f: am
8693f82d: Merge change If1f0bf33 into eclair
Merge commit '
2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0' into eclair-mr2-plus-aosp
* commit '
2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0':
Some work on issue #
2286804: sometimes text field doesn't accept input
Android (Google) Code Review [Thu, 3 Dec 2009 00:24:15 +0000 (16:24 -0800)]
Merge change Icc49422a into eclair
* changes:
Implement new notification LED blinking logic:
Dianne Hackborn [Thu, 3 Dec 2009 00:23:45 +0000 (16:23 -0800)]
am
8693f82d: Merge change If1f0bf33 into eclair
Merge commit '
8693f82d02fd9b3a805e076fa1eafacd1737446d' into eclair-mr2
* commit '
8693f82d02fd9b3a805e076fa1eafacd1737446d':
Some work on issue #
2286804: sometimes text field doesn't accept input
Mathias Agopian [Thu, 3 Dec 2009 00:23:11 +0000 (16:23 -0800)]
fix [
2291418] Camera preview cannot work in Emulator
The image buffer used by glTexImage2d() would be uninitialized when no copybit engine
can be found.
We now always initialize images, since the abscence of copybit is not necessarily fatal.
Android (Google) Code Review [Thu, 3 Dec 2009 00:17:54 +0000 (16:17 -0800)]
Merge change If1f0bf33 into eclair
* changes:
Some work on issue #
2286804: sometimes text field doesn't accept input
Jaikumar Ganesh [Thu, 3 Dec 2009 00:17:15 +0000 (16:17 -0800)]
am
f45bf8fa: am
59c06278: (-s ours) Merge change I721361f1 into eclair
Merge commit '
f45bf8fa4056fc800cc181b7031bd886e97aa1d5' into eclair-mr2-plus-aosp
* commit '
f45bf8fa4056fc800cc181b7031bd886e97aa1d5':
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
Scott Main [Thu, 3 Dec 2009 00:16:45 +0000 (16:16 -0800)]
am
7863eb11: am
525bfe89: Merge change I9fb53a9c into eclair
Merge commit '
7863eb11265cd06ee35a670b5e994d65e31337c3' into eclair-mr2-plus-aosp
* commit '
7863eb11265cd06ee35a670b5e994d65e31337c3':
add screenshots for the Bluetooth Chat sample app
Wink Saville [Thu, 3 Dec 2009 00:16:17 +0000 (16:16 -0800)]
am
2f9d8dbe: Merge change I749d6801 into eclair-mr2
Merge commit '
2f9d8dbe9f5310bc39bf2e31c0fbc396ed6dd979' into eclair-mr2-plus-aosp
* commit '
2f9d8dbe9f5310bc39bf2e31c0fbc396ed6dd979':
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
Jaikumar Ganesh [Thu, 3 Dec 2009 00:10:04 +0000 (16:10 -0800)]
am
59c06278: (-s ours) Merge change I721361f1 into eclair
Merge commit '
59c0627841381f47da5cc72e6ff55fa8bad431ed' into eclair-mr2
* commit '
59c0627841381f47da5cc72e6ff55fa8bad431ed':
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
Android (Google) Code Review [Thu, 3 Dec 2009 00:02:58 +0000 (16:02 -0800)]
Merge change I721361f1 into eclair
* changes:
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
Scott Main [Wed, 2 Dec 2009 23:49:56 +0000 (15:49 -0800)]
am
525bfe89: Merge change I9fb53a9c into eclair
Merge commit '
525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-mr2
* commit '
525bfe896b8638d20e6d7a362fd089ef8e316d4a':
add screenshots for the Bluetooth Chat sample app
Android (Google) Code Review [Wed, 2 Dec 2009 23:40:17 +0000 (15:40 -0800)]
Merge change I9fb53a9c into eclair
* changes:
add screenshots for the Bluetooth Chat sample app
Eric Fischer [Wed, 2 Dec 2009 23:20:54 +0000 (15:20 -0800)]
am
fbc18f9b: am
6d5c42ef: (-s ours) Merge change Id0704505 into eclair
Merge commit '
fbc18f9b203c3bf808f454cb53cfc6d6bf49a8da' into eclair-mr2-plus-aosp
* commit '
fbc18f9b203c3bf808f454cb53cfc6d6bf49a8da':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 2 Dec 2009 23:16:58 +0000 (15:16 -0800)]
Merge change I749d6801 into eclair-mr2
* changes:
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set and minor fixes.
Eric Fischer [Wed, 2 Dec 2009 23:11:36 +0000 (15:11 -0800)]
am
6d5c42ef: (-s ours) Merge change Id0704505 into eclair
Merge commit '
6d5c42ef00a46e0b560b3d15ba73d89d94072af8' into eclair-mr2
* commit '
6d5c42ef00a46e0b560b3d15ba73d89d94072af8':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 2 Dec 2009 23:01:35 +0000 (15:01 -0800)]
Merge change Id0704505 into eclair
* changes:
Import revised translations. DO NOT MERGE
Ken Shirriff [Wed, 2 Dec 2009 21:10:13 +0000 (13:10 -0800)]
am
dfac0e5e: Merge change I3fbd0a2f into eclair-mr2
Merge commit '
dfac0e5ece844c9052d54bfde6b2cc013a818beb' into eclair-mr2-plus-aosp
* commit '
dfac0e5ece844c9052d54bfde6b2cc013a818beb':
Generate a calendar static Java library.
Android (Google) Code Review [Wed, 2 Dec 2009 21:02:36 +0000 (13:02 -0800)]
Merge change I3fbd0a2f into eclair-mr2
* changes:
Generate a calendar static Java library.
Leon Scroggins [Wed, 2 Dec 2009 20:46:32 +0000 (12:46 -0800)]
am
b5c7ef33: When passing the Message for saved form data, pass the node pointer properly.
Merge commit '
b5c7ef331cfca927c5b67bfe472eb7173a0ca69f' into eclair-mr2-plus-aosp
* commit '
b5c7ef331cfca927c5b67bfe472eb7173a0ca69f':
When passing the Message for saved form data, pass the node pointer properly.
Grace Kloba [Wed, 2 Dec 2009 19:48:46 +0000 (11:48 -0800)]
am
4eeace3d: Merge change I097b1e77 into eclair-mr2
Merge commit '
4eeace3db541bd6fa0034a996630768cb521f2eb' into eclair-mr2-plus-aosp
* commit '
4eeace3db541bd6fa0034a996630768cb521f2eb':
Add PageCacheCapacity to the WebSettings.
Android (Google) Code Review [Wed, 2 Dec 2009 19:43:56 +0000 (11:43 -0800)]
Merge change I097b1e77 into eclair-mr2
* changes:
Add PageCacheCapacity to the WebSettings.
Fred Quintana [Wed, 2 Dec 2009 19:38:29 +0000 (11:38 -0800)]
am
f307ec5d: Merge change Iafa92b8f into eclair-mr2
Merge commit '
f307ec5d82ce75112eb60118db89dbfee6819e90' into eclair-mr2-plus-aosp
* commit '
f307ec5d82ce75112eb60118db89dbfee6819e90':
remove accounts for authenticators that are uninstalled
Mark Wagner [Wed, 2 Dec 2009 19:37:55 +0000 (11:37 -0800)]
am
ba1a0717: Merge change I6430912f into eclair-mr2
Merge commit '
ba1a0717946c3d49347e663dda73aa3f91e3d642' into eclair-mr2-plus-aosp
* commit '
ba1a0717946c3d49347e663dda73aa3f91e3d642':
New constants for db upgrade.
Wink Saville [Wed, 2 Dec 2009 19:34:26 +0000 (11:34 -0800)]
am
7d2fd650: am
cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit '
7d2fd6501595137e91ad042cd550decd2f8040fc' into eclair-mr2-plus-aosp
* commit '
7d2fd6501595137e91ad042cd550decd2f8040fc':
Cleanup @hide and @deprecated directives.
Android (Google) Code Review [Wed, 2 Dec 2009 19:31:35 +0000 (11:31 -0800)]
Merge change Iafa92b8f into eclair-mr2
* changes:
remove accounts for authenticators that are uninstalled
Android (Google) Code Review [Wed, 2 Dec 2009 19:30:34 +0000 (11:30 -0800)]
Merge change I6430912f into eclair-mr2
* changes:
New constants for db upgrade.
Wink Saville [Wed, 2 Dec 2009 19:26:23 +0000 (11:26 -0800)]
am
cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit '
cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-mr2
* commit '
cc6ff2bc6011294367d9a8c644f811449e952eb7':
Cleanup @hide and @deprecated directives.
Amith Yamasani [Wed, 2 Dec 2009 17:57:47 +0000 (09:57 -0800)]
am
42c4c589: am
a9791d30: Merge change Iae3ed706 into eclair
Merge commit '
42c4c589003c029309c823e8f06ed00b3cdb21de' into eclair-mr2-plus-aosp
* commit '
42c4c589003c029309c823e8f06ed00b3cdb21de':
Add new setting for notification light pulsing. Bug #
2238250
Dirk Dougherty [Wed, 2 Dec 2009 17:57:17 +0000 (09:57 -0800)]
am
233c50e4: am
43810507: Merge change Ic8231560 into eclair
Merge commit '
233c50e4aa6de6f77b90c5c65f956f9f4251b5a9' into eclair-mr2-plus-aosp
* commit '
233c50e4aa6de6f77b90c5c65f956f9f4251b5a9':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Eric Laurent [Wed, 2 Dec 2009 17:56:44 +0000 (09:56 -0800)]
am
6076046a: am
1ac56b60: Merge change Iac196e17 into eclair
Merge commit '
6076046a11d2cd3733e4c7d108b3b26d167ae731' into eclair-mr2-plus-aosp
* commit '
6076046a11d2cd3733e4c7d108b3b26d167ae731':
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Mathias Agopian [Wed, 2 Dec 2009 17:56:08 +0000 (09:56 -0800)]
am
f764dae4: am
33ad0f9e: Merge change I0e44976a into eclair
Merge commit '
f764dae4a5f662660bea0657746622b6672b24a9' into eclair-mr2-plus-aosp
* commit '
f764dae4a5f662660bea0657746622b6672b24a9':
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
Amith Yamasani [Wed, 2 Dec 2009 17:50:40 +0000 (09:50 -0800)]
am
a9791d30: Merge change Iae3ed706 into eclair
Merge commit '
a9791d304b8ec03e04ad4533b1820a64794e1bcc' into eclair-mr2
* commit '
a9791d304b8ec03e04ad4533b1820a64794e1bcc':
Add new setting for notification light pulsing. Bug #
2238250
Dirk Dougherty [Wed, 2 Dec 2009 17:49:21 +0000 (09:49 -0800)]
am
43810507: Merge change Ic8231560 into eclair
Merge commit '
43810507b75cd492e8177ee082e688f87f0ab49c' into eclair-mr2
* commit '
43810507b75cd492e8177ee082e688f87f0ab49c':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Eric Laurent [Wed, 2 Dec 2009 17:48:52 +0000 (09:48 -0800)]
am
1ac56b60: Merge change Iac196e17 into eclair
Merge commit '
1ac56b602aa6a1ac54c608e5a8b76f44638db23b' into eclair-mr2
* commit '
1ac56b602aa6a1ac54c608e5a8b76f44638db23b':
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Mathias Agopian [Wed, 2 Dec 2009 17:47:48 +0000 (09:47 -0800)]
am
33ad0f9e: Merge change I0e44976a into eclair
Merge commit '
33ad0f9ec8d47660b16ced45242a45f369fe2547' into eclair-mr2
* commit '
33ad0f9ec8d47660b16ced45242a45f369fe2547':
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
Android (Google) Code Review [Wed, 2 Dec 2009 16:35:55 +0000 (08:35 -0800)]
Merge change Iae3ed706 into eclair
* changes:
Add new setting for notification light pulsing. Bug #
2238250
Leon Scroggins [Wed, 2 Dec 2009 15:42:26 +0000 (07:42 -0800)]
am
cfc2915d: In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit '
cfc2915d926cee14380b54d0960262e748eed4f5' into eclair-mr2-plus-aosp
* commit '
cfc2915d926cee14380b54d0960262e748eed4f5':
In setDefaultSelection ensure that webkit is notified of the new selection.
Dianne Hackborn [Wed, 2 Dec 2009 13:35:46 +0000 (05:35 -0800)]
am
9ed7dc10: am
5886050f: Merge change I0d8f7593 into eclair
Merge commit '
9ed7dc10d263a505da32522139098f085fee811a' into eclair-mr2-plus-aosp
* commit '
9ed7dc10d263a505da32522139098f085fee811a':
Fix issue #
2296457: PackageManager.addPackageToPreferred needs to a no-op
Ray Chen [Wed, 2 Dec 2009 13:35:12 +0000 (05:35 -0800)]
am
9db1a37c: am
f27eb326: Merge change I0b6ee9fc into eclair
Merge commit '
9db1a37cc48a01a66ee8026de303faaf4a83667d' into eclair-mr2-plus-aosp
* commit '
9db1a37cc48a01a66ee8026de303faaf4a83667d':
DATE_TAKEN should be in millisecond instead of second.
Leon Scroggins [Wed, 2 Dec 2009 13:34:39 +0000 (05:34 -0800)]
am
ad7ab8be: am
db08d5cd: (-s ours) DO NOT MERGE.
Merge commit '
ad7ab8be4774a4fbb01a50deed52e819549327a7' into eclair-mr2-plus-aosp
* commit '
ad7ab8be4774a4fbb01a50deed52e819549327a7':
DO NOT MERGE.
Dianne Hackborn [Wed, 2 Dec 2009 13:26:12 +0000 (05:26 -0800)]
am
5886050f: Merge change I0d8f7593 into eclair
Merge commit '
5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-mr2
* commit '
5886050fad97923c33cbc831fe07a5b1746b2b58':
Fix issue #
2296457: PackageManager.addPackageToPreferred needs to a no-op
Ray Chen [Wed, 2 Dec 2009 13:25:43 +0000 (05:25 -0800)]
am
f27eb326: Merge change I0b6ee9fc into eclair
Merge commit '
f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2
* commit '
f27eb3264d4b5d3fd154834a709a9a53cc878b58':
DATE_TAKEN should be in millisecond instead of second.
Leon Scroggins [Wed, 2 Dec 2009 13:25:12 +0000 (05:25 -0800)]
Chih-Chung Chang [Wed, 2 Dec 2009 10:54:53 +0000 (02:54 -0800)]
am
54f32f56: Merge change I5ff64f6f into eclair-mr2
Merge commit '
54f32f562b455ddea84ad9b95946a98e6dfb6686' into eclair-mr2-plus-aosp
* commit '
54f32f562b455ddea84ad9b95946a98e6dfb6686':
Add CameraServiceTest.
Android (Google) Code Review [Wed, 2 Dec 2009 10:48:40 +0000 (02:48 -0800)]
Merge change I5ff64f6f into eclair-mr2
* changes:
Add CameraServiceTest.
Android (Google) Code Review [Wed, 2 Dec 2009 06:41:22 +0000 (22:41 -0800)]
Merge change Ic8231560 into eclair
* changes:
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Android (Google) Code Review [Wed, 2 Dec 2009 06:39:33 +0000 (22:39 -0800)]
Merge change Iac196e17 into eclair
* changes:
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Romain Guy [Wed, 2 Dec 2009 03:05:57 +0000 (19:05 -0800)]
am
f7b4accb: Fix scroll jump in ScrollView.
Merge commit '
f7b4accbda1a4d98a5fadbf3984cb9666a4fe9e9' into eclair-mr2-plus-aosp
* commit '
f7b4accbda1a4d98a5fadbf3984cb9666a4fe9e9':
Fix scroll jump in ScrollView.
Scott Main [Wed, 2 Dec 2009 02:44:02 +0000 (18:44 -0800)]
am
03828c0e: am
0bd1eeaf: Merge change I21a67b8d into eclair
Merge commit '
03828c0e675ea2cfb2141dd56d9b2bebc2570646' into eclair-mr2-plus-aosp
* commit '
03828c0e675ea2cfb2141dd56d9b2bebc2570646':
docs: remove droid-specific behavior change from platform notes
Jaikumar Ganesh [Wed, 2 Dec 2009 02:43:32 +0000 (18:43 -0800)]
am
9cf7f7cf: am
a80a75f3: (-s ours) Merge change I5f24a240 into eclair
Merge commit '
9cf7f7cfc5b75fbea8d65999fcf86b6d9a7ad044' into eclair-mr2-plus-aosp
* commit '
9cf7f7cfc5b75fbea8d65999fcf86b6d9a7ad044':
Register Handsfree profile before headset profile. DO NOT MERGE.
Mike Lockwood [Wed, 2 Dec 2009 02:42:55 +0000 (18:42 -0800)]
am
c1bb46e9: am
abf7fed2: Merge change I2b7c8a32 into eclair
Merge commit '
c1bb46e9d58f05449d8420c81f5cae06e1084ac2' into eclair-mr2-plus-aosp
* commit '
c1bb46e9d58f05449d8420c81f5cae06e1084ac2':
Fix more of bug
2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Bai Tao [Wed, 2 Dec 2009 02:42:13 +0000 (18:42 -0800)]
am
a8c79a8c: am
90aaaef5: Merge change I0e200c3c into eclair
Merge commit '
a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b' into eclair-mr2-plus-aosp
* commit '
a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b':
Sending UCS2 encoded SMS correctly
Mathias Agopian [Wed, 2 Dec 2009 02:41:42 +0000 (18:41 -0800)]
am
77f17095: am
533a2803: Merge change I18ffb549 into eclair
Merge commit '
77f17095ed17a6ccc7fc1f1b3ddb31c63bbf66a2' into eclair-mr2-plus-aosp
* commit '
77f17095ed17a6ccc7fc1f1b3ddb31c63bbf66a2':
fix [
2069023] STOPSHIP: disable DEBUG_COPYBIT
Mathias Agopian [Wed, 2 Dec 2009 02:41:01 +0000 (18:41 -0800)]
am
102f4dbb: am
8e4a110b: Merge change I5469a4ac into eclair
Merge commit '
102f4dbb2396e779c588862cfb748ebfc333340d' into eclair-mr2-plus-aosp
* commit '
102f4dbb2396e779c588862cfb748ebfc333340d':
fixed [
2260070] display stopped updating
Eric Fischer [Wed, 2 Dec 2009 02:40:07 +0000 (18:40 -0800)]
am
c711e06c: am
926492d9: (-s ours) Merge change Ie8493cf1 into eclair
Merge commit '
c711e06c1869b1e5be5b7a9826470564268328ac' into eclair-mr2-plus-aosp
* commit '
c711e06c1869b1e5be5b7a9826470564268328ac':
Import revised translations. DO NOT MERGE
Eric Laurent [Wed, 2 Dec 2009 02:39:17 +0000 (18:39 -0800)]
am
5e392e2b: am
bb3bb57a: Merge change I524dc046 into eclair
Merge commit '
5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp
* commit '
5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Scott Main [Wed, 2 Dec 2009 02:31:19 +0000 (18:31 -0800)]
am
0bd1eeaf: Merge change I21a67b8d into eclair
Merge commit '
0bd1eeaf90d854c487feb8ee35c5c74af28ebc74' into eclair-mr2
* commit '
0bd1eeaf90d854c487feb8ee35c5c74af28ebc74':
docs: remove droid-specific behavior change from platform notes
Jaikumar Ganesh [Wed, 2 Dec 2009 02:30:45 +0000 (18:30 -0800)]
am
a80a75f3: (-s ours) Merge change I5f24a240 into eclair
Merge commit '
a80a75f34a98fe1e41afab93c97aca505939903a' into eclair-mr2
* commit '
a80a75f34a98fe1e41afab93c97aca505939903a':
Register Handsfree profile before headset profile. DO NOT MERGE.
Mike Lockwood [Wed, 2 Dec 2009 02:30:12 +0000 (18:30 -0800)]
am
abf7fed2: Merge change I2b7c8a32 into eclair
Merge commit '
abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-mr2
* commit '
abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
Fix more of bug
2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Android (Google) Code Review [Wed, 2 Dec 2009 02:01:25 +0000 (18:01 -0800)]
Merge change I0e44976a into eclair
* changes:
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
Ken Shirriff [Wed, 2 Dec 2009 01:38:52 +0000 (17:38 -0800)]
Generate a calendar static Java library.
This contains the calendar contract and pim functions for use by the
sync adapter. This library is a duplicate of the functions in the
framework.
Mathias Agopian [Wed, 2 Dec 2009 01:23:28 +0000 (17:23 -0800)]
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
There was bug in the logic that calculated the relative timeout, the start time was
reset each time an event was received, which caused the timeout to never occur if
an application was constantly redrawing.
Now we always check for a timeout when we come back from the waitEvent() and
process the "anti-freeze" if needed, regardless of whether an event was received.
Bai Tao [Wed, 2 Dec 2009 01:16:50 +0000 (17:16 -0800)]
am
90aaaef5: Merge change I0e200c3c into eclair
Merge commit '
90aaaef5f97ee885cc5898f3e7517ad4e5943d2f' into eclair-mr2
* commit '
90aaaef5f97ee885cc5898f3e7517ad4e5943d2f':
Sending UCS2 encoded SMS correctly
Mathias Agopian [Wed, 2 Dec 2009 01:13:50 +0000 (17:13 -0800)]
am
533a2803: Merge change I18ffb549 into eclair
Merge commit '
533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-mr2
* commit '
533a2803506cc4f196403fdfafd948bd4f8e60d9':
fix [
2069023] STOPSHIP: disable DEBUG_COPYBIT
Romain Guy [Wed, 2 Dec 2009 01:11:38 +0000 (17:11 -0800)]
am
cf98f426: Merge change I325e22ca into eclair-mr2
Merge commit '
cf98f4268cc70228ef49350f1ccef1266f2e3cf8' into eclair-mr2-plus-aosp
* commit '
cf98f4268cc70228ef49350f1ccef1266f2e3cf8':
Fix a leak in WebView.
Andreas Huber [Wed, 2 Dec 2009 01:10:19 +0000 (17:10 -0800)]
am
781ac162: Merge change I8768f2cc into eclair-mr2
Merge commit '
781ac16283574ec07cd7b13d67b54b7b4c2c15cb' into eclair-mr2-plus-aosp
* commit '
781ac16283574ec07cd7b13d67b54b7b4c2c15cb':
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
Mathias Agopian [Wed, 2 Dec 2009 01:10:08 +0000 (17:10 -0800)]
am
8e4a110b: Merge change I5469a4ac into eclair
Merge commit '
8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f' into eclair-mr2
* commit '
8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f':
fixed [
2260070] display stopped updating
Vasu Nori [Wed, 2 Dec 2009 01:08:38 +0000 (17:08 -0800)]
am
1533aed6: Merge change Ib1dd3235 into eclair-mr2
Merge commit '
1533aed6d90b776c815bae819d1413064aa1f0d9' into eclair-mr2-plus-aosp
* commit '
1533aed6d90b776c815bae819d1413064aa1f0d9':
fix NPE. don't release an already released compiledSql obj
Eric Fischer [Wed, 2 Dec 2009 01:08:16 +0000 (17:08 -0800)]
am
926492d9: (-s ours) Merge change Ie8493cf1 into eclair
Merge commit '
926492d9cc51f28f0471352cde77d2d91ae9becd' into eclair-mr2
* commit '
926492d9cc51f28f0471352cde77d2d91ae9becd':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Wed, 2 Dec 2009 01:06:59 +0000 (17:06 -0800)]
am
03cb1f15: Merge change I249345ee into eclair-mr2
Merge commit '
03cb1f15ca73900f62c12694e05bb0b0e0b6669d' into eclair-mr2-plus-aosp
* commit '
03cb1f15ca73900f62c12694e05bb0b0e0b6669d':
Add AUTO_CONNECT priority for Headset profile.
Derek Sollenberger [Wed, 2 Dec 2009 01:05:18 +0000 (17:05 -0800)]
am
732a1223: Merge change I42d00fbe into eclair-mr2
Merge commit '
732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c' into eclair-mr2-plus-aosp
* commit '
732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c':
fix issue with plugin surfaces not updating properly within the view system.
Eric Laurent [Wed, 2 Dec 2009 01:04:24 +0000 (17:04 -0800)]
am
bb3bb57a: Merge change I524dc046 into eclair
Merge commit '
bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2
* commit '
bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Android (Google) Code Review [Wed, 2 Dec 2009 00:40:07 +0000 (16:40 -0800)]
Merge change I325e22ca into eclair-mr2
* changes:
Fix a leak in WebView.
Android (Google) Code Review [Tue, 1 Dec 2009 23:57:50 +0000 (15:57 -0800)]
Merge change I0d8f7593 into eclair
* changes:
Fix issue #
2296457: PackageManager.addPackageToPreferred needs to a no-op
Android (Google) Code Review [Tue, 1 Dec 2009 23:42:34 +0000 (15:42 -0800)]
Merge change I8768f2cc into eclair-mr2
* changes:
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
Android (Google) Code Review [Tue, 1 Dec 2009 22:49:23 +0000 (14:49 -0800)]
Merge change I0b6ee9fc into eclair
* changes:
DATE_TAKEN should be in millisecond instead of second.
Android (Google) Code Review [Tue, 1 Dec 2009 22:24:52 +0000 (14:24 -0800)]
Merge change Ib1dd3235 into eclair-mr2
* changes:
fix NPE. don't release an already released compiledSql obj
Android (Google) Code Review [Tue, 1 Dec 2009 20:45:49 +0000 (12:45 -0800)]
Merge change I249345ee into eclair-mr2
* changes:
Add AUTO_CONNECT priority for Headset profile.
Android (Google) Code Review [Tue, 1 Dec 2009 20:26:54 +0000 (12:26 -0800)]
Merge change I42d00fbe into eclair-mr2
* changes:
fix issue with plugin surfaces not updating properly within the view system.
Leon Scroggins [Tue, 1 Dec 2009 17:12:01 +0000 (09:12 -0800)]
am
ed90811e: Do not peform a click/move if longpress has been performed in WebTextView.
Merge commit '
ed90811e711065bcc82a45f4173587cd95ef6b6f' into eclair-mr2-plus-aosp
* commit '
ed90811e711065bcc82a45f4173587cd95ef6b6f':
Do not peform a click/move if longpress has been performed in WebTextView.
Derek Sollenberger [Tue, 1 Dec 2009 14:14:33 +0000 (06:14 -0800)]
am
51e45ff0: Cleanup how a plugin goes full-screen.
Merge commit '
51e45ff0d53ce299be316e14e48cdd3e3a51d0b0' into eclair-mr2-plus-aosp
* commit '
51e45ff0d53ce299be316e14e48cdd3e3a51d0b0':
Cleanup how a plugin goes full-screen.
Derek Sollenberger [Tue, 1 Dec 2009 13:23:29 +0000 (05:23 -0800)]
am
c3e20af0: Merge change Ib16749e2 into eclair-mr2
Merge commit '
c3e20af0b6aed8afe28be5fa08b8d69c6b50f34c' into eclair-mr2-plus-aosp
* commit '
c3e20af0b6aed8afe28be5fa08b8d69c6b50f34c':
Refactoring the logging interface to remove dependence on NPP.
Android (Google) Code Review [Tue, 1 Dec 2009 13:17:44 +0000 (05:17 -0800)]
Merge change Ib16749e2 into eclair-mr2
* changes:
Refactoring the logging interface to remove dependence on NPP.
Eric Laurent [Tue, 1 Dec 2009 10:17:41 +0000 (02:17 -0800)]
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
The problem comes from a deadlock with AudioPolicyService mutex: When the second ringtone starts,
this mutex is locked by AudioPolicyService::startOutput() which in turn calls setParameters() to change the output device.
Audioflinger::ThreadBase::setParameters() signals the parameter change to the AudioFlinger mixer thread and waits for a condition
indicating that the parameter change has been processed.
At the same time, the mixer thread detects that the audio track corresponding to the first ring tone has been killed and calls its destructor.
This calls AudioPolicyService::releaseOutput() which tries to lock the AudioPolicyService mutex.
If this happens before the mixer thread can process the setParameters() command we are deadlocked.
The deadlock ends because setParameters() uses a timeout when waiting for the condition.
This regression was introduced by change 33736 fixing issue
2265163.
The fix consists in calling AudioPolicyService::releaseOutput() from Track::destroy() instead of from Track destructor: as detroy() is never called from the mixer thread loop (as opposed to the destructor) the deadlock described above cannot occur.
Android (Google) Code Review [Tue, 1 Dec 2009 01:38:57 +0000 (17:38 -0800)]
Merge change I21a67b8d into eclair
* changes:
docs: remove droid-specific behavior change from platform notes
Android (Google) Code Review [Tue, 1 Dec 2009 01:00:43 +0000 (17:00 -0800)]
Merge change I5f24a240 into eclair
* changes:
Register Handsfree profile before headset profile. DO NOT MERGE.
Jaikumar Ganesh [Tue, 1 Dec 2009 00:40:52 +0000 (16:40 -0800)]
am
e34fbbd7: Merge change I77b4ad0e into eclair-mr2
Merge commit '
e34fbbd739329e5aeda2c1a2ef26b96bb1ae42fa' into eclair-mr2-plus-aosp
* commit '
e34fbbd739329e5aeda2c1a2ef26b96bb1ae42fa':
Register Handsfree profile before headset profile.
Android (Google) Code Review [Tue, 1 Dec 2009 00:39:53 +0000 (16:39 -0800)]
Merge change I2b7c8a32 into eclair
* changes:
Fix more of bug
2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Android (Google) Code Review [Tue, 1 Dec 2009 00:35:43 +0000 (16:35 -0800)]
Merge change I77b4ad0e into eclair-mr2
* changes:
Register Handsfree profile before headset profile.
Android (Google) Code Review [Tue, 1 Dec 2009 00:35:18 +0000 (16:35 -0800)]
Merge change I0e200c3c into eclair
* changes:
Sending UCS2 encoded SMS correctly
Doug Zongker [Tue, 1 Dec 2009 00:27:56 +0000 (16:27 -0800)]
am
b292461c: Merge change I305e1b8f into eclair-mr2
Merge commit '
b292461c6791b6e6780085358a5ba15f688e70ba' into eclair-mr2-plus-aosp
* commit '
b292461c6791b6e6780085358a5ba15f688e70ba':
add --esn option to am to allow adding extra with a null value
Android (Google) Code Review [Tue, 1 Dec 2009 00:23:09 +0000 (16:23 -0800)]
Merge change I305e1b8f into eclair-mr2
* changes:
add --esn option to am to allow adding extra with a null value
Android (Google) Code Review [Mon, 30 Nov 2009 20:13:01 +0000 (12:13 -0800)]
Merge change I18ffb549 into eclair
* changes:
fix [
2069023] STOPSHIP: disable DEBUG_COPYBIT
OSDN Git Service
