OSDN Git Service
Christopher Tate [Fri, 4 Dec 2009 20:54:36 +0000 (12:54 -0800)]
am
d3bc1994: Merge change I397b6a93 into eclair
Merge commit '
d3bc1994b0c2c5e9c60fa748de47eebbe1984fda' into eclair-mr2
* commit '
d3bc1994b0c2c5e9c60fa748de47eebbe1984fda':
Don't accidentally signal multiple exceptions in setThreadPriority()
Android (Google) Code Review [Fri, 4 Dec 2009 20:51:44 +0000 (12:51 -0800)]
Merge change I397b6a93 into eclair
* changes:
Don't accidentally signal multiple exceptions in setThreadPriority()
Android (Google) Code Review [Fri, 4 Dec 2009 20:00:13 +0000 (12:00 -0800)]
Merge change Iab5c49c7 into eclair-mr2
* changes:
move event log tags used by system server into this package
Ray Chen [Fri, 4 Dec 2009 19:57:10 +0000 (11:57 -0800)]
am
052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. b/
2297371
Merge commit '
052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2
* commit '
052d9c8b414dc9eb1c70d849660592d9bc3b2644':
Images.Media.DATE_TAKEN should be in milliseconds.
Android (Google) Code Review [Fri, 4 Dec 2009 19:51:05 +0000 (11:51 -0800)]
Merge change If32b488b into eclair-mr2
* changes:
Add new unit test for RadioGroup/RadioButton.
Android (Google) Code Review [Fri, 4 Dec 2009 19:20:54 +0000 (11:20 -0800)]
Merge change Ie46db339 into eclair-mr2
* changes:
Remove "unused" opcodes from API.
Android (Google) Code Review [Fri, 4 Dec 2009 19:08:28 +0000 (11:08 -0800)]
Merge change I4261c58d into eclair-mr2
* changes:
Check if another Activity wants to intercept an xml mime type.
Romain Guy [Fri, 4 Dec 2009 18:37:59 +0000 (10:37 -0800)]
am
48a65d99: Merge change I8c5f2fc3 into eclair
Merge commit '
48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2
* commit '
48a65d99cba33db3af2e05982a6825b883be2030':
Fix invalidate code path (#
2273209).
Android (Google) Code Review [Fri, 4 Dec 2009 18:22:47 +0000 (10:22 -0800)]
Merge change I8c5f2fc3 into eclair
* changes:
Fix invalidate code path (#
2273209).
Jim Miller [Fri, 4 Dec 2009 06:18:24 +0000 (22:18 -0800)]
am
1296d562: Merge change I8b63ab66 into eclair
Merge commit '
1296d562cf9b80e439724e15b4fdaf6626d2b4df' into eclair-mr2
* commit '
1296d562cf9b80e439724e15b4fdaf6626d2b4df':
Better animation for sliding widget.
Android (Google) Code Review [Fri, 4 Dec 2009 06:14:19 +0000 (22:14 -0800)]
Merge change I8b63ab66 into eclair
* changes:
Better animation for sliding widget.
Android (Google) Code Review [Fri, 4 Dec 2009 04:03:59 +0000 (20:03 -0800)]
Merge change I6c84d731 into eclair-mr2
* changes:
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Fred Quintana [Fri, 4 Dec 2009 01:17:00 +0000 (17:17 -0800)]
am
0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit '
0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2
* commit '
0ce8431c15078e095a22a123dbabcd91049a9652':
don't reschedule syncs that failed with a tooManyRetries error
Android (Google) Code Review [Fri, 4 Dec 2009 01:10:59 +0000 (17:10 -0800)]
Merge change Iaa7edda4 into eclair
* changes:
don't reschedule syncs that failed with a tooManyRetries error
Android (Google) Code Review [Fri, 4 Dec 2009 00:27:16 +0000 (16:27 -0800)]
Merge change I85e5d39e into eclair-mr2
* changes:
Two more uses of strlcpy that break the sim build. Now fixed.
Jason Sams [Fri, 4 Dec 2009 00:23:23 +0000 (16:23 -0800)]
am
5c49a908: (-s ours) Merge change Ic73ec39b into eclair
Merge commit '
5c49a9080df9e46193efa8326318c86bc8976eea' into eclair-mr2
* commit '
5c49a9080df9e46193efa8326318c86bc8976eea':
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
Android (Google) Code Review [Fri, 4 Dec 2009 00:15:46 +0000 (16:15 -0800)]
Merge change Ic73ec39b into eclair
* changes:
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
Scott Main [Fri, 4 Dec 2009 00:14:13 +0000 (16:14 -0800)]
Merge branch 'eclair-mr2' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2
Scott Main [Fri, 4 Dec 2009 00:13:19 +0000 (16:13 -0800)]
am
5d0806c9: Merge change Ia70bd8c4 into eclair
Merge commit '
5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2
* commit '
5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
add BluetoothChat sample app to the dev guide
Android (Google) Code Review [Fri, 4 Dec 2009 00:06:52 +0000 (16:06 -0800)]
Merge change Ia70bd8c4 into eclair
* changes:
add BluetoothChat sample app to the dev guide
Android (Google) Code Review [Thu, 3 Dec 2009 23:51:09 +0000 (15:51 -0800)]
Merge change I1f1c7bad into eclair-mr2
* changes:
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Erik Gilling [Thu, 3 Dec 2009 23:35:55 +0000 (15:35 -0800)]
am
cef8d031: Merge change I00d0b54a into eclair
Merge commit '
cef8d031e842b773bbd6481b517996a185391e92' into eclair-mr2
* commit '
cef8d031e842b773bbd6481b517996a185391e92':
surfaceflinger: remove un-cached buffer hack for SGX
Android (Google) Code Review [Thu, 3 Dec 2009 23:30:23 +0000 (15:30 -0800)]
Merge change I00d0b54a into eclair
* changes:
surfaceflinger: remove un-cached buffer hack for SGX
Dianne Hackborn [Thu, 3 Dec 2009 22:52:46 +0000 (14:52 -0800)]
Erik Gilling [Thu, 3 Dec 2009 22:08:19 +0000 (14:08 -0800)]
surfaceflinger: remove un-cached buffer hack for SGX
Signed-off-by: Erik Gilling <konkers@android.com>
Android (Google) Code Review [Thu, 3 Dec 2009 21:55:07 +0000 (13:55 -0800)]
Merge change I6173d7c7 into eclair-mr2
* changes:
Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
Android (Google) Code Review [Thu, 3 Dec 2009 21:27:08 +0000 (13:27 -0800)]
Merge change I74bf38a0 into eclair-mr2
* changes:
Squashed commit of the following:
San Mehat [Thu, 3 Dec 2009 20:45:59 +0000 (12:45 -0800)]
am
0a42b811: base: process: Abort setting the process group if one of the threads fails to switch
Merge commit '
0a42b811aea490a9a605b75f0320101f6eafd283' into eclair-mr2
* commit '
0a42b811aea490a9a605b75f0320101f6eafd283':
base: process: Abort setting the process group if one of the threads fails to switch
Android (Google) Code Review [Thu, 3 Dec 2009 20:10:12 +0000 (12:10 -0800)]
Merge change I20d77880 into eclair-mr2
* changes:
Make Gservices setting constants public.
Jaikumar Ganesh [Thu, 3 Dec 2009 20:01:38 +0000 (12:01 -0800)]
am
8c411fb1: Merge change I79420b02 into eclair
Merge commit '
8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-mr2
* commit '
8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
Add support for Car Dock.
Scott Main [Thu, 3 Dec 2009 19:54:43 +0000 (11:54 -0800)]
am
90d311ff: Merge change I33e0f00e into eclair
Merge commit '
90d311ff33f33024f642ef03a02fb62566c9f46b' into eclair-mr2
* commit '
90d311ff33f33024f642ef03a02fb62566c9f46b':
docs: fix markup error in xml sample
Android (Google) Code Review [Thu, 3 Dec 2009 19:49:38 +0000 (11:49 -0800)]
Merge change I79420b02 into eclair
* changes:
Add support for Car Dock.
Android (Google) Code Review [Thu, 3 Dec 2009 19:40:22 +0000 (11:40 -0800)]
Merge change I33e0f00e into eclair
* changes:
docs: fix markup error in xml sample
Android (Google) Code Review [Thu, 3 Dec 2009 19:25:54 +0000 (11:25 -0800)]
Merge change Ib904c2a4 into eclair-mr2
* changes:
Remove old hack A/V sync hack that is no longer needed.
Mike Lockwood [Thu, 3 Dec 2009 19:18:48 +0000 (11:18 -0800)]
am
678c2e35: Merge change I9ef88863 into eclair
Merge commit '
678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2
* commit '
678c2e35768a5426b4ad8f67c836008e7751a353':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Android (Google) Code Review [Thu, 3 Dec 2009 18:59:25 +0000 (10:59 -0800)]
Merge change I9ef88863 into eclair
* changes:
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Ray Chen [Thu, 3 Dec 2009 18:35:45 +0000 (10:35 -0800)]
am
e12de4d5: Merge change Id5fa58cf into eclair
Merge commit '
e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-mr2
* commit '
e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
Fix timezone issue to comply with EXIF standard.
Android (Google) Code Review [Thu, 3 Dec 2009 18:24:18 +0000 (10:24 -0800)]
Merge change Id5fa58cf into eclair
* changes:
Fix timezone issue to comply with EXIF standard.
Daniel Sandler [Thu, 3 Dec 2009 16:42:34 +0000 (08:42 -0800)]
am
14bee131: Fix lock screen layouts with emergency call buttons.
Merge commit '
14bee131da68404b33655a241de83c2eeb417559' into eclair-mr2
* commit '
14bee131da68404b33655a241de83c2eeb417559':
Fix lock screen layouts with emergency call buttons.
Wu-cheng Li [Thu, 3 Dec 2009 08:16:35 +0000 (00:16 -0800)]
am
40057ce7: Document that stopPreview is not needed before takePicture.
Merge commit '
40057ce749c8c4d274db0352a2af4344bda92dba' into eclair-mr2
* commit '
40057ce749c8c4d274db0352a2af4344bda92dba':
Document that stopPreview is not needed before takePicture.
Joe Onorato [Thu, 3 Dec 2009 07:33:56 +0000 (23:33 -0800)]
am
19a4157c: Make the notification panel send the position as well.
Merge commit '
19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-mr2
* commit '
19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.
Joe Onorato [Thu, 3 Dec 2009 07:16:11 +0000 (23:16 -0800)]
am
7597065d: Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit '
7597065d6b0877ffc460b443fdb1595965ccd7b2' into eclair-mr2
* commit '
7597065d6b0877ffc460b443fdb1595965ccd7b2':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Joe Onorato [Thu, 3 Dec 2009 06:40:57 +0000 (22:40 -0800)]
am
c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent.
Merge commit '
c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-mr2
* commit '
c7a63eea8d3d346addaaf892b5bbe0aa80651640':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Android (Google) Code Review [Thu, 3 Dec 2009 05:17:57 +0000 (21:17 -0800)]
Merge change I51438c18 into eclair-mr2
* changes:
the vertex index should be "first + i".
Jack Veenstra [Thu, 3 Dec 2009 05:09:10 +0000 (21:09 -0800)]
am
de534329: Merge change Ica5efffe into eclair
Merge commit '
de5343290c4bac9b10b6fdd328b70da6f5e4d626' into eclair-mr2
* commit '
de5343290c4bac9b10b6fdd328b70da6f5e4d626':
Fix bug
2216426: correct the hdpi star assets for RatingBar.
Android (Google) Code Review [Thu, 3 Dec 2009 05:01:20 +0000 (21:01 -0800)]
Merge change Ica5efffe into eclair
* changes:
Fix bug
2216426: correct the hdpi star assets for RatingBar.
Dianne Hackborn [Thu, 3 Dec 2009 02:56:20 +0000 (18:56 -0800)]
am
dcd58cfd: Merge change I7b9328c7 into eclair
Merge commit '
dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-mr2
* commit '
dcd58cfda366c915b1f0739cb115f9d972351c73':
Fix issue #
2300232: Bugs in resolving conflicting pointers
Android (Google) Code Review [Thu, 3 Dec 2009 02:51:19 +0000 (18:51 -0800)]
Merge change I7b9328c7 into eclair
* changes:
Fix issue #
2300232: Bugs in resolving conflicting pointers
Omari Stephens [Thu, 3 Dec 2009 02:26:05 +0000 (18:26 -0800)]
am
7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '
7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-mr2
* commit '
7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
Revive backup tests
Android (Google) Code Review [Thu, 3 Dec 2009 02:21:49 +0000 (18:21 -0800)]
Merge change Iaa6e73a6 into eclair
* changes:
Revive backup tests
Android (Google) Code Review [Thu, 3 Dec 2009 02:04:23 +0000 (18:04 -0800)]
Merge change I8179742a into eclair-mr2
* changes:
Add support for extracting render time and image in page cycler
Android (Google) Code Review [Thu, 3 Dec 2009 01:56:20 +0000 (17:56 -0800)]
Merge change I611c15cf into eclair-mr2
* changes:
Add DoCoMo vendor specific OMNA WSP content type number Import CL 145261 from //branches/cupcake_dcm
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.
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
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: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
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
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.
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.
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: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
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)]
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.
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
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
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
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.
OSDN Git Service
