OSDN Git Service
Dianne Hackborn [Fri, 4 Dec 2009 12:32:00 +0000 (04:32 -0800)]
am
f7407998: am
39b08235: Add API level 8, currently a copy of 7.
Merge commit '
f7407998387fdfd1c755084a1c00f2819d27431a'
* commit '
f7407998387fdfd1c755084a1c00f2819d27431a':
Add API level 8, currently a copy of 7.
Fred Quintana [Fri, 4 Dec 2009 12:31:52 +0000 (04:31 -0800)]
am
a8dd0a54: am
298de218: am
0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit '
a8dd0a545409af281b73e483dc203f6e3f8d1de6'
* commit '
a8dd0a545409af281b73e483dc203f6e3f8d1de6':
don't reschedule syncs that failed with a tooManyRetries error
Andreas Huber [Fri, 4 Dec 2009 12:30:40 +0000 (04:30 -0800)]
am
f4eb754b: am
2a428fd4: Merge change I85e5d39e into eclair-mr2
Merge commit '
f4eb754b1810a60e640401396c1f9a10be65dffa'
* commit '
f4eb754b1810a60e640401396c1f9a10be65dffa':
Two more uses of strlcpy that break the sim build. Now fixed.
Jason Sams [Fri, 4 Dec 2009 12:30:31 +0000 (04:30 -0800)]
am
3bac3ad2: (-s ours) am
9737dc4d: am
5c49a908: (-s ours) Merge change Ic73ec39b into eclair
Merge commit '
3bac3ad2dfb11c99ebfc5cd0374b29259686117e'
* commit '
3bac3ad2dfb11c99ebfc5cd0374b29259686117e':
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 12:30:21 +0000 (04:30 -0800)]
am
06ef1d21: am
9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2
Merge commit '
06ef1d2104b4c90d5b134ae17e2562fd6bedda17'
* commit '
06ef1d2104b4c90d5b134ae17e2562fd6bedda17':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Scott Main [Fri, 4 Dec 2009 12:30:13 +0000 (04:30 -0800)]
am
0633dc49: am
e08361d7: am
5d0806c9: Merge change Ia70bd8c4 into eclair
Merge commit '
0633dc49fa7862bcd519555ec73803ab6379229d'
* commit '
0633dc49fa7862bcd519555ec73803ab6379229d':
add BluetoothChat sample app to the dev guide
Andreas Huber [Fri, 4 Dec 2009 12:28:22 +0000 (04:28 -0800)]
am
b8fb6c0b: am
8d670d34: Merge change I1f1c7bad into eclair-mr2
Merge commit '
b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4'
* commit '
b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4':
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Erik Gilling [Fri, 4 Dec 2009 12:28:12 +0000 (04:28 -0800)]
am
20208ff6: am
9b565d5b: am
cef8d031: Merge change I00d0b54a into eclair
Merge commit '
20208ff643b33956c93d1f3fa1fa2c2d06fc7d02'
* commit '
20208ff643b33956c93d1f3fa1fa2c2d06fc7d02':
surfaceflinger: remove un-cached buffer hack for SGX
Dianne Hackborn [Fri, 4 Dec 2009 12:28:00 +0000 (04:28 -0800)]
Daisuke Miyakawa [Fri, 4 Dec 2009 12:27:48 +0000 (04:27 -0800)]
am
0f6357d8: am
67d9aa15: Merge change I6173d7c7 into eclair-mr2
Merge commit '
0f6357d855a328eb62210feccff5e44c81578553'
* commit '
0f6357d855a328eb62210feccff5e44c81578553':
Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
Andreas Huber [Fri, 4 Dec 2009 12:27:37 +0000 (04:27 -0800)]
am
9ee55cc1: am
2d6d609c: Merge change I74bf38a0 into eclair-mr2
Merge commit '
9ee55cc1bc6878b243134a558d583786d9215958'
* commit '
9ee55cc1bc6878b243134a558d583786d9215958':
Squashed commit of the following:
Andreas Huber [Fri, 4 Dec 2009 12:27:25 +0000 (04:27 -0800)]
am
874c508c: am
bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit '
874c508c5352936c0640317ef44b81c9b632dfd6'
* commit '
874c508c5352936c0640317ef44b81c9b632dfd6':
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
San Mehat [Fri, 4 Dec 2009 12:27:12 +0000 (04:27 -0800)]
am
ca84ac88: am
d345c6ac: am
0a42b811: base: process: Abort setting the process group if one of the threads fails to switch
Merge commit '
ca84ac88c7f6940677f9b796b21779e53965bf06'
* commit '
ca84ac88c7f6940677f9b796b21779e53965bf06':
base: process: Abort setting the process group if one of the threads fails to switch
Ken Shirriff [Fri, 4 Dec 2009 12:26:59 +0000 (04:26 -0800)]
am
208364d3: am
4850b5cd: Merge change I20d77880 into eclair-mr2
Merge commit '
208364d304d332241301870bd75b69e181f72446'
* commit '
208364d304d332241301870bd75b69e181f72446':
Make Gservices setting constants public.
Jaikumar Ganesh [Fri, 4 Dec 2009 12:26:46 +0000 (04:26 -0800)]
am
0b18c94f: am
11a2853e: am
8c411fb1: Merge change I79420b02 into eclair
Merge commit '
0b18c94f765d8e98be3da037ce9757f099b541b2'
* commit '
0b18c94f765d8e98be3da037ce9757f099b541b2':
Add support for Car Dock.
Scott Main [Fri, 4 Dec 2009 12:26:33 +0000 (04:26 -0800)]
am
ea01f514: am
7f1ab539: am
90d311ff: Merge change I33e0f00e into eclair
Merge commit '
ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b'
* commit '
ea01f514e161a2310fd21d8aef8a4b3aaca4ac7b':
docs: fix markup error in xml sample
Dave Sparks [Fri, 4 Dec 2009 12:26:18 +0000 (04:26 -0800)]
am
b06ecc40: am
7c09a0ff: Merge change Ib904c2a4 into eclair-mr2
Merge commit '
b06ecc401160c5906fd1f4c85f61163bc2875200'
* commit '
b06ecc401160c5906fd1f4c85f61163bc2875200':
Remove old hack A/V sync hack that is no longer needed.
Mike Lockwood [Fri, 4 Dec 2009 12:26:04 +0000 (04:26 -0800)]
am
20e7c267: am
44000eb2: am
678c2e35: Merge change I9ef88863 into eclair
Merge commit '
20e7c267c8f8d2de8f121bbf20f5d34487f17997'
* commit '
20e7c267c8f8d2de8f121bbf20f5d34487f17997':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Ray Chen [Fri, 4 Dec 2009 12:25:49 +0000 (04:25 -0800)]
am
29d503c6: am
1b794bbb: am
e12de4d5: Merge change Id5fa58cf into eclair
Merge commit '
29d503c6cc9df7882859c689d23609a543b24d8a'
* commit '
29d503c6cc9df7882859c689d23609a543b24d8a':
Fix timezone issue to comply with EXIF standard.
Vasu Nori [Fri, 4 Dec 2009 12:25:34 +0000 (04:25 -0800)]
am
25bd4f29: am
6d1ec0d8: dealloc compiled-sql statements before deref\'ing them from SQLiteDatabase obj.
Merge commit '
25bd4f29e1720d78d164c9749f786a2add6cafe9'
* commit '
25bd4f29e1720d78d164c9749f786a2add6cafe9':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
Daniel Sandler [Fri, 4 Dec 2009 12:25:19 +0000 (04:25 -0800)]
am
09380e02: am
add86719: am
14bee131: Fix lock screen layouts with emergency call buttons.
Merge commit '
09380e0232b9a6652a5ac6d96ac5aec03c755dca'
* commit '
09380e0232b9a6652a5ac6d96ac5aec03c755dca':
Fix lock screen layouts with emergency call buttons.
Android (Google) Code Review [Fri, 4 Dec 2009 05:28:53 +0000 (21:28 -0800)]
Merge change Id3e3d0a3
* changes:
Fix the broken build of omxjpegdecoder: http://b/
2299035.
Dianne Hackborn [Fri, 4 Dec 2009 02:30:21 +0000 (18:30 -0800)]
am
39b08235: Add API level 8, currently a copy of 7.
Merge commit '
39b082356851e29ba7a0af981eaa27d3b08a387b' into eclair-mr2-plus-aosp
* commit '
39b082356851e29ba7a0af981eaa27d3b08a387b':
Add API level 8, currently a copy of 7.
Fred Quintana [Fri, 4 Dec 2009 01:25:36 +0000 (17:25 -0800)]
am
298de218: am
0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit '
298de218c540eab6c4e6c3415ab8a5c985c57772' into eclair-mr2-plus-aosp
* commit '
298de218c540eab6c4e6c3415ab8a5c985c57772':
don't reschedule syncs that failed with a tooManyRetries error
Dianne Hackborn [Fri, 4 Dec 2009 00:41:59 +0000 (16:41 -0800)]
Add API level 8, currently a copy of 7.
Wu-cheng Li [Fri, 4 Dec 2009 01:21:27 +0000 (17:21 -0800)]
am
20b213c7: am
64fc8082: am
40057ce7: Document that stopPreview is not needed before takePicture.
Merge commit '
20b213c7dd9d18d092a60ea176dd83cc29d6be80'
* commit '
20b213c7dd9d18d092a60ea176dd83cc29d6be80':
Document that stopPreview is not needed before takePicture.
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
Andreas Huber [Fri, 4 Dec 2009 00:53:27 +0000 (16:53 -0800)]
am
2a428fd4: Merge change I85e5d39e into eclair-mr2
Merge commit '
2a428fd463431e2b3d3680faf2e9640989ca7791' into eclair-mr2-plus-aosp
* commit '
2a428fd463431e2b3d3680faf2e9640989ca7791':
Two more uses of strlcpy that break the sim build. Now fixed.
Jason Sams [Fri, 4 Dec 2009 00:51:59 +0000 (16:51 -0800)]
am
9737dc4d: am
5c49a908: (-s ours) Merge change Ic73ec39b into eclair
Merge commit '
9737dc4de2ce56c5fb3d6911e48cfbfd63a19325' into eclair-mr2-plus-aosp
* commit '
9737dc4de2ce56c5fb3d6911e48cfbfd63a19325':
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:51:20 +0000 (16:51 -0800)]
am
9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2
Merge commit '
9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp
* commit '
9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Scott Main [Fri, 4 Dec 2009 00:50:42 +0000 (16:50 -0800)]
am
e08361d7: am
5d0806c9: Merge change Ia70bd8c4 into eclair
Merge commit '
e08361d7fda2234f447f4ffb7f480d045f8c5f78' into eclair-mr2-plus-aosp
* commit '
e08361d7fda2234f447f4ffb7f480d045f8c5f78':
add BluetoothChat sample app to the dev guide
Andreas Huber [Fri, 4 Dec 2009 00:44:26 +0000 (16:44 -0800)]
am
8d670d34: Merge change I1f1c7bad into eclair-mr2
Merge commit '
8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp
* commit '
8d670d345893fb9b9566f6b8c20202b77d4d211a':
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Erik Gilling [Fri, 4 Dec 2009 00:43:05 +0000 (16:43 -0800)]
am
9b565d5b: am
cef8d031: Merge change I00d0b54a into eclair
Merge commit '
9b565d5bf38e77774956524f137d509471ae5fb2' into eclair-mr2-plus-aosp
* commit '
9b565d5bf38e77774956524f137d509471ae5fb2':
surfaceflinger: remove un-cached buffer hack for SGX
Dianne Hackborn [Fri, 4 Dec 2009 00:41:47 +0000 (16:41 -0800)]
am
eefe7b1b: am
b2e49a23: Add API level 7.
Merge commit '
eefe7b1b3e24a84a62f1b711cc9fa4aaca4a62c6' into eclair-mr2-plus-aosp
* commit '
eefe7b1b3e24a84a62f1b711cc9fa4aaca4a62c6':
Add API level 7.
Daisuke Miyakawa [Fri, 4 Dec 2009 00:40:50 +0000 (16:40 -0800)]
am
67d9aa15: Merge change I6173d7c7 into eclair-mr2
Merge commit '
67d9aa15b6c6217a7d3b7b017924af132d048e56' into eclair-mr2-plus-aosp
* commit '
67d9aa15b6c6217a7d3b7b017924af132d048e56':
Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
Andreas Huber [Fri, 4 Dec 2009 00:40:04 +0000 (16:40 -0800)]
am
2d6d609c: Merge change I74bf38a0 into eclair-mr2
Merge commit '
2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp
* commit '
2d6d609c9ede7ed8924001df00af9c13effab8ad':
Squashed commit of the following:
Andreas Huber [Fri, 4 Dec 2009 00:39:27 +0000 (16:39 -0800)]
am
bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit '
bfb9fb143b67c2d0307af2bce9af3c08f362b29a' into eclair-mr2-plus-aosp
* commit '
bfb9fb143b67c2d0307af2bce9af3c08f362b29a':
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
San Mehat [Fri, 4 Dec 2009 00:38:47 +0000 (16:38 -0800)]
am
d345c6ac: am
0a42b811: base: process: Abort setting the process group if one of the threads fails to switch
Merge commit '
d345c6acedb22c9408553ef9f38c196984177e6b' into eclair-mr2-plus-aosp
* commit '
d345c6acedb22c9408553ef9f38c196984177e6b':
base: process: Abort setting the process group if one of the threads fails to switch
Ken Shirriff [Fri, 4 Dec 2009 00:37:27 +0000 (16:37 -0800)]
am
4850b5cd: Merge change I20d77880 into eclair-mr2
Merge commit '
4850b5cd743f4513d59ff41cd6cb548a3a9879d6' into eclair-mr2-plus-aosp
* commit '
4850b5cd743f4513d59ff41cd6cb548a3a9879d6':
Make Gservices setting constants public.
Jaikumar Ganesh [Fri, 4 Dec 2009 00:36:29 +0000 (16:36 -0800)]
am
11a2853e: am
8c411fb1: Merge change I79420b02 into eclair
Merge commit '
11a2853e0196905e25a2dc5c227320688e04e950' into eclair-mr2-plus-aosp
* commit '
11a2853e0196905e25a2dc5c227320688e04e950':
Add support for Car Dock.
Scott Main [Fri, 4 Dec 2009 00:35:39 +0000 (16:35 -0800)]
am
7f1ab539: am
90d311ff: Merge change I33e0f00e into eclair
Merge commit '
7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp
* commit '
7f1ab539ceb56182d36d8782171a2dd84f96ea3b':
docs: fix markup error in xml sample
Dave Sparks [Fri, 4 Dec 2009 00:34:07 +0000 (16:34 -0800)]
am
7c09a0ff: Merge change Ib904c2a4 into eclair-mr2
Merge commit '
7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp
* commit '
7c09a0ff365d6df96e880422a7b389ddf63401da':
Remove old hack A/V sync hack that is no longer needed.
Mike Lockwood [Fri, 4 Dec 2009 00:33:14 +0000 (16:33 -0800)]
am
44000eb2: am
678c2e35: Merge change I9ef88863 into eclair
Merge commit '
44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp
* commit '
44000eb2a2340b1a47eaa587d4829810e04cbcdc':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Ray Chen [Fri, 4 Dec 2009 00:31:56 +0000 (16:31 -0800)]
am
1b794bbb: am
e12de4d5: Merge change Id5fa58cf into eclair
Merge commit '
1b794bbbdc961558a9f0ee956d9d3f684d1f0497' into eclair-mr2-plus-aosp
* commit '
1b794bbbdc961558a9f0ee956d9d3f684d1f0497':
Fix timezone issue to comply with EXIF standard.
Vasu Nori [Fri, 4 Dec 2009 00:31:03 +0000 (16:31 -0800)]
am
6d1ec0d8: dealloc compiled-sql statements before deref\'ing them from SQLiteDatabase obj.
Merge commit '
6d1ec0d81cd8ecdd390b31e724bac554bb955a94' into eclair-mr2-plus-aosp
* commit '
6d1ec0d81cd8ecdd390b31e724bac554bb955a94':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
Daniel Sandler [Fri, 4 Dec 2009 00:30:21 +0000 (16:30 -0800)]
am
add86719: am
14bee131: Fix lock screen layouts with emergency call buttons.
Merge commit '
add867197c0ae81b8120d70e4ae936df4a9c29bb' into eclair-mr2-plus-aosp
* commit '
add867197c0ae81b8120d70e4ae936df4a9c29bb':
Fix lock screen layouts with emergency call buttons.
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.
Andreas Huber [Fri, 4 Dec 2009 00:22:52 +0000 (16:22 -0800)]
Two more uses of strlcpy that break the sim build. Now fixed.
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
Andreas Huber [Fri, 4 Dec 2009 00:07:05 +0000 (16:07 -0800)]
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
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.
Andreas Huber [Thu, 3 Dec 2009 23:45:53 +0000 (15:45 -0800)]
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Jason Sams [Thu, 3 Dec 2009 23:43:18 +0000 (15:43 -0800)]
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 [Wed, 2 Dec 2009 23:42:30 +0000 (15:42 -0800)]
add BluetoothChat sample app to the dev guide
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)]
Fred Quintana [Thu, 3 Dec 2009 22:18:58 +0000 (14:18 -0800)]
don't reschedule syncs that failed with a tooManyRetries error
Dianne Hackborn [Thu, 3 Dec 2009 22:13:53 +0000 (14:13 -0800)]
Add API level 7.
Change-Id: Id87dc724f0758ce0faee9c00621d4af6cb9f5bd9
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:
Andreas Huber [Thu, 3 Dec 2009 19:31:19 +0000 (11:31 -0800)]
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Andreas Huber [Thu, 3 Dec 2009 19:39:54 +0000 (11:39 -0800)]
Squashed commit of the following:
commit
543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 3 11:33:57 2009 -0800
stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...
commit
3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 2 12:39:07 2009 -0800
More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
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
San Mehat [Thu, 3 Dec 2009 20:21:28 +0000 (12:21 -0800)]
base: process: Abort setting the process group if one of the threads fails to switch
Signed-off-by: San Mehat <san@google.com>
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
Jaikumar Ganesh [Thu, 3 Dec 2009 01:28:38 +0000 (17:28 -0800)]
Add support for Car Dock.
Dr No: Eastham
Bug:
2133530
Scott Main [Thu, 3 Dec 2009 19:33:25 +0000 (11:33 -0800)]
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.
Joe Onorato [Thu, 3 Dec 2009 18:54:04 +0000 (10:54 -0800)]
am
a6c4556d: am
a8974b63: am
19a4157c: Make the notification panel send the position as well.
Merge commit '
a6c4556dea7d498783aff8a38e0e50c2b172beda'
* commit '
a6c4556dea7d498783aff8a38e0e50c2b172beda':
Make the notification panel send the position as well.
Joe Onorato [Thu, 3 Dec 2009 18:52:35 +0000 (10:52 -0800)]
am
963559ec: am
6c5401d8: am
7597065d: Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit '
963559ec0a2a8eaf118b4bbcedaa7274ef8909f2'
* commit '
963559ec0a2a8eaf118b4bbcedaa7274ef8909f2':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Joe Onorato [Thu, 3 Dec 2009 18:51:34 +0000 (10:51 -0800)]
am
dbed5350: am
b28632a5: 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 '
dbed53504f515337ccc2f60248bb589dff0f24fb'
* commit '
dbed53504f515337ccc2f60248bb589dff0f24fb':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Dmitri Plotnikov [Thu, 3 Dec 2009 18:50:10 +0000 (10:50 -0800)]
Li Wenhao [Thu, 3 Dec 2009 18:48:17 +0000 (10:48 -0800)]
am
f8625381: am
2b3509c9: Merge change I51438c18 into eclair-mr2
Merge commit '
f86253816b7166096111d29cb3708b1156f7ebf3'
* commit '
f86253816b7166096111d29cb3708b1156f7ebf3':
the vertex index should be "first + i".
Jack Veenstra [Thu, 3 Dec 2009 18:47:21 +0000 (10:47 -0800)]
am
55f62d19: am
1b04daf9: am
de534329: Merge change Ica5efffe into eclair
Merge commit '
55f62d1995404219d4f491b2f19befaa7c6f632f'
* commit '
55f62d1995404219d4f491b2f19befaa7c6f632f':
Fix bug
2216426: correct the hdpi star assets for RatingBar.
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.
Dave Sparks [Thu, 3 Dec 2009 18:13:32 +0000 (10:13 -0800)]
Remove old hack A/V sync hack that is no longer needed.
Vasu Nori [Wed, 2 Dec 2009 21:21:12 +0000 (13:21 -0800)]
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
dealloc compiled-sql statements before removing references of SQLiteClosable objects from SQLiteDatabase obj. otherwise, code will attempt to close database before deallocing the compiled-sql statements and that causes sqlite exceptions.
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.
Daniel Sandler [Wed, 2 Dec 2009 21:15:37 +0000 (16:15 -0500)]
Fix lock screen layouts with emergency call buttons.
Fixes http://b/
2259529
Partially fixes http://b/
2260798
Change-Id: Iabb3f74dc2a331810ae8ff44ebb319fe25d217ef
Wei-Ta Chen [Thu, 3 Dec 2009 15:19:19 +0000 (23:19 +0800)]
Fix the broken build of omxjpegdecoder: b/
2299035.
1) Add the include path for jni.h.
2) Rename InitCheck() and read_at() to initCheck() and readAt(),
repectively in StreamSource, as done in DataSource.
3) Add back the definition of SkJPEGImageDecoder to jpeg_decoder_bench.cpp.
Need to do so because SkJPEGImageDecoder is not defined in a header file.
Mike Lockwood [Thu, 3 Dec 2009 13:40:18 +0000 (08:40 -0500)]
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Part of a fix for bug b/
2300622 (Proximity sensor always blows up the lock screen while in call)
Change-Id: I9ef888638b19540a78a34507d52ff522f505102f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Wu-cheng Li [Thu, 3 Dec 2009 08:22:43 +0000 (00:22 -0800)]
am
64fc8082: am
40057ce7: Document that stopPreview is not needed before takePicture.
Merge commit '
64fc80823e1e954a419bdcb0a193e4c56a8da959' into eclair-mr2-plus-aosp
* commit '
64fc80823e1e954a419bdcb0a193e4c56a8da959':
Document that stopPreview is not needed before takePicture.
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.
Wu-cheng Li [Wed, 2 Dec 2009 10:57:29 +0000 (18:57 +0800)]
Document that stopPreview is not needed before takePicture.
Also, applications can call startPreview after jpeg callback is received.
http://b/
2292461
Joe Onorato [Thu, 3 Dec 2009 07:39:16 +0000 (23:39 -0800)]
am
a8974b63: am
19a4157c: Make the notification panel send the position as well.
Merge commit '
a8974b637c384d10bac10d94fae7487afdb2c16d' into eclair-mr2-plus-aosp
* commit '
a8974b637c384d10bac10d94fae7487afdb2c16d':
Make the notification panel send the position as well.
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.