Android (Google) Code Review
b0cc59cdf7
Merge change I611c15cf into eclair-mr2
...
* changes:
Add DoCoMo vendor specific OMNA WSP content type number Import CL 145261 from //branches/cupcake_dcm
2009-12-02 17:56:20 -08:00
Android (Google) Code Review
9322313e6b
Merge change Icae1a990 into eclair-mr2
...
* changes:
Adding NAME_RAW_CONTACT_ID column to Contacts.
2009-12-02 17:55:39 -08:00
Mathias Agopian
fd70b7f335
am 121a31ac: Merge change Id86beb99 into eclair
...
Merge commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-mr2
* commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:50:45 -08:00
Android (Google) Code Review
91e4152760
Merge change Id86beb99 into eclair
...
* changes:
fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:09:46 -08:00
Mike Lockwood
a59a9d25e2
resolved conflicts for merge of 9b7dba93 to eclair-mr2
...
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
2009-12-02 19:57:33 -05:00
Android (Google) Code Review
c15de03df8
Merge change Icc49422a into eclair
...
* changes:
Implement new notification LED blinking logic:
2009-12-02 16:24:15 -08:00
Dianne Hackborn
44fe74c901
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
2009-12-02 16:23:45 -08:00
Mathias Agopian
3e8a81e354
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.
2009-12-02 16:23:11 -08:00
Android (Google) Code Review
4fb7951251
Merge change If1f0bf33 into eclair
...
* changes:
Some work on issue #2286804 : sometimes text field doesn't accept input
2009-12-02 16:17:54 -08:00
Jaikumar Ganesh
11ed4774c1
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.
2009-12-02 16:10:04 -08:00
Android (Google) Code Review
7db8f45d8b
Merge change I721361f1 into eclair
...
* changes:
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
2009-12-02 16:02:58 -08:00
Scott Main
aa01214bcb
am 525bfe89: Merge change I9fb53a9c into eclair
...
Merge commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-mr2
* commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a':
add screenshots for the Bluetooth Chat sample app
2009-12-02 15:49:56 -08:00
Android (Google) Code Review
574101140a
Merge change I9fb53a9c into eclair
...
* changes:
add screenshots for the Bluetooth Chat sample app
2009-12-02 15:40:17 -08:00
Android (Google) Code Review
1d9c8f8ff8
Merge change I749d6801 into eclair-mr2
...
* changes:
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set and minor fixes.
2009-12-02 15:16:58 -08:00
Eric Fischer
1cccb28efa
am 6d5c42ef: (-s ours) Merge change Id0704505 into eclair
...
Merge commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8' into eclair-mr2
* commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8':
Import revised translations. DO NOT MERGE
2009-12-02 15:11:36 -08:00
Android (Google) Code Review
75aa7bddc7
Merge change Id0704505 into eclair
...
* changes:
Import revised translations. DO NOT MERGE
2009-12-02 15:01:35 -08:00
Android (Google) Code Review
1d9a37f92b
Merge change I3fbd0a2f into eclair-mr2
...
* changes:
Generate a calendar static Java library.
2009-12-02 13:02:36 -08:00
Android (Google) Code Review
e2493811e4
Merge change I097b1e77 into eclair-mr2
...
* changes:
Add PageCacheCapacity to the WebSettings.
2009-12-02 11:43:56 -08:00
Android (Google) Code Review
9b2fe0d68a
Merge change Iafa92b8f into eclair-mr2
...
* changes:
remove accounts for authenticators that are uninstalled
2009-12-02 11:31:35 -08:00
Android (Google) Code Review
c3e5b02c09
Merge change I6430912f into eclair-mr2
...
* changes:
New constants for db upgrade.
2009-12-02 11:30:34 -08:00
Wink Saville
89822e69cf
am cc6ff2bc: Cleanup @hide and @deprecated directives.
...
Merge commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-mr2
* commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7':
Cleanup @hide and @deprecated directives.
2009-12-02 11:26:23 -08:00
Amith Yamasani
6ec4f46210
am a9791d30: Merge change Iae3ed706 into eclair
...
Merge commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc' into eclair-mr2
* commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc':
Add new setting for notification light pulsing. Bug #2238250
2009-12-02 09:50:40 -08:00
Dirk Dougherty
4561dad711
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.
2009-12-02 09:49:21 -08:00
Eric Laurent
b598e9f38d
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.
2009-12-02 09:48:52 -08:00
Mathias Agopian
ca8fa5a7bf
am 33ad0f9e: Merge change I0e44976a into eclair
...
Merge commit '33ad0f9ec8d47660b16ced45242a45f369fe2547' into eclair-mr2
* commit '33ad0f9ec8d47660b16ced45242a45f369fe2547':
fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
2009-12-02 09:47:48 -08:00
Android (Google) Code Review
7b1451d360
Merge change Iae3ed706 into eclair
...
* changes:
Add new setting for notification light pulsing. Bug #2238250
2009-12-02 08:35:55 -08:00
Dianne Hackborn
99d4d53cda
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
2009-12-02 05:26:12 -08:00
Ray Chen
88c9b881ec
am f27eb326: Merge change I0b6ee9fc into eclair
...
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2
* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
DATE_TAKEN should be in millisecond instead of second.
2009-12-02 05:25:43 -08:00
Leon Scroggins
3e22f3c866
am db08d5cd: (-s ours) DO NOT MERGE.
...
Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-mr2
* commit 'db08d5cd441424e4f9621aae7c2414934f781400':
DO NOT MERGE.
2009-12-02 05:25:12 -08:00
Android (Google) Code Review
abb64629e2
Merge change I5ff64f6f into eclair-mr2
...
* changes:
Add CameraServiceTest.
2009-12-02 02:48:40 -08:00
Android (Google) Code Review
63c33bc9c1
Merge change Ic8231560 into eclair
...
* changes:
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
2009-12-01 22:41:22 -08:00
Android (Google) Code Review
9e50912d68
Merge change Iac196e17 into eclair
...
* changes:
Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
2009-12-01 22:39:33 -08:00
Scott Main
39b2dcd126
am 0bd1eeaf: Merge change I21a67b8d into eclair
...
Merge commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74' into eclair-mr2
* commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74':
docs: remove droid-specific behavior change from platform notes
2009-12-01 18:31:19 -08:00
Jaikumar Ganesh
b18020b91a
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.
2009-12-01 18:30:45 -08:00
Mike Lockwood
79df7759e9
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.
2009-12-01 18:30:12 -08:00
Android (Google) Code Review
516369e34f
Merge change I0e44976a into eclair
...
* changes:
fix [2297155] SurfaceFlinger's freeze-timeout doesn't work
2009-12-01 18:01:25 -08:00
Ken Shirriff
b9297d0d53
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.
2009-12-01 17:42:41 -08:00
Mathias Agopian
0408772e34
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.
2009-12-01 17:23:28 -08:00
Bai Tao
b426f63c14
am 90aaaef5: Merge change I0e200c3c into eclair
...
Merge commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f' into eclair-mr2
* commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f':
Sending UCS2 encoded SMS correctly
2009-12-01 17:16:50 -08:00
Mathias Agopian
ea5b203790
am 533a2803: Merge change I18ffb549 into eclair
...
Merge commit '533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-mr2
* commit '533a2803506cc4f196403fdfafd948bd4f8e60d9':
fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-12-01 17:13:50 -08:00
Mathias Agopian
5f1cc4826c
am 8e4a110b: Merge change I5469a4ac into eclair
...
Merge commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f' into eclair-mr2
* commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f':
fixed [2260070] display stopped updating
2009-12-01 17:10:08 -08:00
Eric Fischer
95023f0409
am 926492d9: (-s ours) Merge change Ie8493cf1 into eclair
...
Merge commit '926492d9cc51f28f0471352cde77d2d91ae9becd' into eclair-mr2
* commit '926492d9cc51f28f0471352cde77d2d91ae9becd':
Import revised translations. DO NOT MERGE
2009-12-01 17:08:16 -08:00
Eric Laurent
811f2943a7
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.
2009-12-01 17:04:24 -08:00
Android (Google) Code Review
271715e469
Merge change I325e22ca into eclair-mr2
...
* changes:
Fix a leak in WebView.
2009-12-01 16:40:07 -08:00
Android (Google) Code Review
f5d9079518
Merge change I0d8f7593 into eclair
...
* changes:
Fix issue #2296457 : PackageManager.addPackageToPreferred needs to a no-op
2009-12-01 15:57:50 -08:00
Android (Google) Code Review
171fb3a654
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).
2009-12-01 15:42:34 -08:00
Android (Google) Code Review
18facb7c4d
Merge change I0b6ee9fc into eclair
...
* changes:
DATE_TAKEN should be in millisecond instead of second.
2009-12-01 14:49:23 -08:00
Android (Google) Code Review
5cd52bc9e3
Merge change Ib1dd3235 into eclair-mr2
...
* changes:
fix NPE. don't release an already released compiledSql obj
2009-12-01 14:24:52 -08:00
Android (Google) Code Review
54be503563
Merge change I249345ee into eclair-mr2
...
* changes:
Add AUTO_CONNECT priority for Headset profile.
2009-12-01 12:45:49 -08:00
Android (Google) Code Review
413b440bbb
Merge change I42d00fbe into eclair-mr2
...
* changes:
fix issue with plugin surfaces not updating properly within the view system.
2009-12-01 12:26:54 -08:00