Commit Graph

6929 Commits

Author SHA1 Message Date
Mike Lockwood
0cafe9d064 am 8d1eeb21: am 2d155d26: PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '8d1eeb2144945365cae281552bd7bc5eb14f7688' into eclair-mr2-plus-aosp

* commit '8d1eeb2144945365cae281552bd7bc5eb14f7688':
  PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
2009-10-28 12:45:54 -07:00
Mike Lockwood
c545e9275b am 7c64d448: am 8061f64f: Merge change Ib0d3d9d0 into eclair
Merge commit '7c64d4486ad8704f0b63474e2da0dd89147771ad' into eclair-mr2-plus-aosp

* commit '7c64d4486ad8704f0b63474e2da0dd89147771ad':
  PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
2009-10-28 12:45:38 -07:00
Dirk Dougherty
8738071f06 am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '4c071f0d69ac0e3eaf386797faeb52d63de30806' into eclair-mr2-plus-aosp

* commit '4c071f0d69ac0e3eaf386797faeb52d63de30806':
  doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 12:45:22 -07:00
Scott Main
a8e9358fc6 am 66e69251: am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '66e6925154a64d4fab53e6241e9e1fd227f42352' into eclair-mr2-plus-aosp

* commit '66e6925154a64d4fab53e6241e9e1fd227f42352':
  docs: add 2.0 highlights doc and updated homepage
2009-10-28 12:45:03 -07:00
Dirk Dougherty
62df8772d3 am 53976509: am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
Merge commit '53976509639b136150a844ff92544f96cf048943' into eclair-mr2-plus-aosp

* commit '53976509639b136150a844ff92544f96cf048943':
  doc change: fix broken link at top of installing doc
2009-10-28 12:44:46 -07:00
Yu Shan Emily Lau
4d747b0f4e am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair
Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp

* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 12:44:28 -07:00
Dave Sparks
2e5a52a9ae am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclair
Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp

* commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 12:44:10 -07:00
Brett Chabot
7dec3ef6b5 am 622b190c: am b81df8e3: Merge change I5535bbdf into eclair
Merge commit '622b190c878e38468096ef0fe1cd28dbc10c3b33' into eclair-mr2-plus-aosp

* commit '622b190c878e38468096ef0fe1cd28dbc10c3b33':
  Disable flaky and failing tests.
2009-10-28 12:43:52 -07:00
Andreas Huber
212e195600 am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed' into eclair-mr2-plus-aosp

* commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-28 12:43:31 -07:00
Mike Lockwood
1a2e4e867a am 2d155d26: PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-mr2

* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
  PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
2009-10-28 11:41:10 -07:00
Mike Lockwood
cdae98fc72 am 8061f64f: Merge change Ib0d3d9d0 into eclair
Merge commit '8061f64f6246116381131fc7951b6d88be37161a' into eclair-mr2

* commit '8061f64f6246116381131fc7951b6d88be37161a':
  PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
2009-10-28 11:40:47 -07:00
Dirk Dougherty
fe21be387d am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '59625fa86ad0e520931361aba120e2d868f01618' into eclair-mr2

* commit '59625fa86ad0e520931361aba120e2d868f01618':
  doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-28 11:39:48 -07:00
Scott Main
57a81230c1 am 91bfbfb9: am 08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4' into eclair-mr2

* commit '91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4':
  docs: add 2.0 highlights doc and updated homepage
2009-10-28 11:39:26 -07:00
Dirk Dougherty
4667460e84 am 37ebfad1: am a250f0c8: doc change: fix broken link at top of installing doc
Merge commit '37ebfad1619f250bda4803dfb8683f408d9482cb' into eclair-mr2

* commit '37ebfad1619f250bda4803dfb8683f408d9482cb':
  doc change: fix broken link at top of installing doc
2009-10-28 11:39:04 -07:00
Yu Shan Emily Lau
f3e49b4c9f am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 11:38:34 -07:00
Dave Sparks
c230112530 am e8543418: Merge change I7c0d20a7 into eclair
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2

* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 11:38:08 -07:00
Brett Chabot
23bd681018 am b81df8e3: Merge change I5535bbdf into eclair
Merge commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-mr2

* commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56':
  Disable flaky and failing tests.
2009-10-28 11:37:42 -07:00
Andreas Huber
e8e544e546 am 54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2

* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-28 11:37:16 -07:00
Jaikumar Ganesh
8da3c647fb am 9fa7048c: am 6158038a: Merge change I2811f162 into eclair
Merge commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2' into eclair-mr2-plus-aosp

* commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2':
  Add Authentication Type field to the APN settings.
2009-10-28 10:37:57 -07:00
Mike Lockwood
06e0cdf56e am 4dee223c: am 86328a99: LocationManagerService: clear calling identity in mock provider calls.
Merge commit '4dee223c68d98ebac6bb3d91c2d6e47eb2b0a001' into eclair-mr2-plus-aosp

* commit '4dee223c68d98ebac6bb3d91c2d6e47eb2b0a001':
  LocationManagerService: clear calling identity in mock provider calls.
2009-10-28 10:37:43 -07:00
Mike Lockwood
121b87776e am ed7755cc: am 3333fa4f: PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp

* commit 'ed7755cc30fe6b2b0254207347629ad0cae094db':
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
2009-10-28 10:37:28 -07:00
Eric Laurent
ff27cd42ea am 34180d32: am a47d1536: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '34180d328c57a6a38bc85651fda0e69890ad7a9b' into eclair-mr2-plus-aosp

* commit '34180d328c57a6a38bc85651fda0e69890ad7a9b':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
2009-10-28 10:37:13 -07:00
Andreas Huber
8b047d6c0b am 76a54294: Merge change I155e2ad0 into eclair-mr2
Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp

* commit '76a5429407e821c22508eca92e7475b6433cd668':
  Re-enable CameraSource.
2009-10-28 10:36:57 -07:00
Jaikumar Ganesh
f05d3b75ca am 6158038a: Merge change I2811f162 into eclair
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2

* commit '6158038a09069bc178970160d4b3667573bfc655':
  Add Authentication Type field to the APN settings.
2009-10-28 10:30:11 -07:00
Mike Lockwood
3fcbcfba87 am 86328a99: LocationManagerService: clear calling identity in mock provider calls.
Merge commit '86328a99bd55532e318441d48ee9eb96cdc42403' into eclair-mr2

* commit '86328a99bd55532e318441d48ee9eb96cdc42403':
  LocationManagerService: clear calling identity in mock provider calls.
2009-10-28 10:28:19 -07:00
Mike Lockwood
7088deb2d4 am 3333fa4f: PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-mr2

* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
2009-10-28 10:27:45 -07:00
Eric Laurent
cd708a9b4b am a47d1536: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-mr2

* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
2009-10-28 10:26:33 -07:00
Android (Google) Code Review
a04cf23bbd Merge change I155e2ad0 into eclair-mr2
* changes:
  Re-enable CameraSource.
2009-10-28 13:25:09 -04:00
Andreas Huber
65f4bd8807 am 27123468: Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we\'re examining it (leak checker).
Merge commit '27123468b33cb61a1600079d583302b1b078b2ee' into eclair-mr2-plus-aosp

* commit '27123468b33cb61a1600079d583302b1b078b2ee':
  Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
2009-10-27 16:06:21 -07:00
Leon Scroggins
e1e10700df am bb107bd6: Many fixes to text input in the browser, particularly when moving to a new field.
Merge commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f' into eclair-mr2-plus-aosp

* commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f':
  Many fixes to text input in the browser, particularly when moving to a new field.
2009-10-27 13:20:33 -07:00
Derek Sollenberger
52dd31f0f4 am 718d69f9: changing how plugins gain/lose focus.
Merge commit '718d69f931e320b9a8d98371a0b4925d7c2e83f4' into eclair-mr2-plus-aosp

* commit '718d69f931e320b9a8d98371a0b4925d7c2e83f4':
  changing how plugins gain/lose focus.
2009-10-27 08:24:32 -07:00
Cary Clark
04c2581912 am 09e383c9: tweak select text
Merge commit '09e383c9ff4a3b762084e999dfb5fdd347abc151' into eclair-mr2-plus-aosp

* commit '09e383c9ff4a3b762084e999dfb5fdd347abc151':
  tweak select text
2009-10-27 08:00:49 -07:00
Android (Google) Code Review
b6733cb599 Merge change Ib0d3d9d0 into eclair
* changes:
  PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
2009-10-27 08:01:38 -04:00
Daisuke Miyakawa
b5c7a5991a am bb88e3ad: Move verification code to VCardTestsBase.
Merge commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499' into eclair-mr2-plus-aosp

* commit 'bb88e3ad568a05cc816fa786fcf1902fa9497499':
  Move verification code to VCardTestsBase.
2009-10-26 22:33:57 -07:00
Andreas Huber
ceff2f5145 am dfdf9453: Merge change I3085c83e into eclair-mr2
Merge commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1' into eclair-mr2-plus-aosp

* commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1':
  When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
2009-10-26 22:33:42 -07:00
Dirk Dougherty
1f317d7bea am 946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '946f9d1edc25346f42e30e94e1553bcadea2acf5' into eclair

* commit '946f9d1edc25346f42e30e94e1553bcadea2acf5':
  doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-26 18:31:20 -07:00
Scott Main
4e69f3e14c am 08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '08c57535d180469bf902e75fc90c9f87c5ceb9a7' into eclair

* commit '08c57535d180469bf902e75fc90c9f87c5ceb9a7':
  docs: add 2.0 highlights doc and updated homepage
2009-10-26 18:31:04 -07:00
Dirk Dougherty
e6bdaa7ad9 am a250f0c8: doc change: fix broken link at top of installing doc
Merge commit 'a250f0c808ff01f7a5c9fe393ef2bdf4266a7d9f' into eclair

* commit 'a250f0c808ff01f7a5c9fe393ef2bdf4266a7d9f':
  doc change: fix broken link at top of installing doc
2009-10-26 18:30:30 -07:00
Android (Google) Code Review
7da9abd326 Merge change I020b31e1 into eclair-sdk
* changes:
  doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
2009-10-26 21:24:44 -04:00
Android (Google) Code Review
b922a57fa4 Merge change I96458368 into eclair
* changes:
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-26 21:10:48 -04:00
Android (Google) Code Review
acc3a9b43e Merge change I7c0d20a7 into eclair
* changes:
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-26 21:00:46 -04:00
Android (Google) Code Review
b97c23139e Merge change I5535bbdf into eclair
* changes:
  Disable flaky and failing tests.
2009-10-26 20:59:29 -04:00
Android (Google) Code Review
26120af439 Merge change I3085c83e into eclair-mr2
* changes:
  When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
2009-10-26 19:26:37 -04:00
Daisuke Miyakawa
854778803b am d263a064: Add a test for vCard composer.
Merge commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5' into eclair-mr2-plus-aosp

* commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5':
  Add a test for vCard composer.
2009-10-26 16:18:17 -07:00
Android (Google) Code Review
5dc142c8ce Merge change I6e50a8c6 into eclair
* changes:
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
2009-10-26 18:41:19 -04:00
Android (Google) Code Review
857851f55b Merge change I2811f162 into eclair
* changes:
  Add Authentication Type field to the APN settings.
2009-10-26 18:14:15 -04:00
Mike Reed
f55825780a am 57e824f7: Merge change I8db532c1 into eclair-mr2
Merge commit '57e824f7c33caf1e8c9cb08795464df4b8dbb218' into eclair-mr2-plus-aosp

* commit '57e824f7c33caf1e8c9cb08795464df4b8dbb218':
  don't turn off filtering/dithering when we scroll.
2009-10-26 06:24:48 -07:00
Mike Lockwood
41f35d5f6d am 0f2a4e60: am 6897e36b: Add comment warning to not use hardware based autobrightness support.
Merge commit '0f2a4e6026a37fc8b321494f688e9f0e5a5bf744' into eclair-mr2-plus-aosp

* commit '0f2a4e6026a37fc8b321494f688e9f0e5a5bf744':
  Add comment warning to not use hardware based autobrightness support.
2009-10-26 06:24:33 -07:00
Android (Google) Code Review
10494b4455 Merge change I8db532c1 into eclair-mr2
* changes:
  don't turn off filtering/dithering when we scroll.
2009-10-26 09:16:20 -04:00
Mike Lockwood
249552492a am 9baeff05: am 6eb14c30: PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '9baeff05a8bf9bd4479f2a357dca0463cc750202' into eclair-mr2-plus-aosp

* commit '9baeff05a8bf9bd4479f2a357dca0463cc750202':
  PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
2009-10-25 09:13:05 -07:00