29108 Commits

Author SHA1 Message Date
Steve Block
fbc2030426 Merge "Hook up device sensors for DeviceOrientation" 2010-08-24 08:35:03 -07:00
Steve Block
bb9db22fbb Hook up device sensors for DeviceOrientation
Change-Id: Ic7165a07a02e3c38165b2f92e3ec7368d2b60e19
2010-08-24 16:33:46 +01:00
Irfan Sheriff
b43ae28951 Merge "cache configured networks" 2010-08-24 08:30:49 -07:00
Mike Lockwood
8c68865649 Merge "MTP: Check and clear exceptions after calling into Java in MtpDatabase" 2010-08-24 08:28:54 -07:00
Mike Lockwood
0a7fa0a868 MTP: Check and clear exceptions after calling into Java in MtpDatabase
Change-Id: I805858c66fe57208c06aa624d16b72966555e005
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-24 11:25:28 -04:00
Steve Block
f24079a28f Merge "Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html" 2010-08-24 07:51:07 -07:00
Derek Sollenberger
41d5e93bbd Move APK monitoring into WebView.
This CL adds the monitoring logic that was removed from the Browser
in a companion CL.  This allows applications other than the Browser
to use special features offered by YouTube and plugins. Additionally,
the pluginManager was refactored to prevent code duplication between
the manager and WebView.

Change-Id: Ie37f248c8edd9d06ae1fd6675dd5f06f04774b09
http://b/2834603
2010-08-24 09:31:59 -04:00
Kristian Monsen
f52435569c Merge "Java calls to get Android specific files." 2010-08-24 04:50:12 -07:00
Iain Merrick
558f7dcf05 Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
This patch modifies the old-style hard-coded ignore list. The new-style
text file (in external/webkit/LayoutTests/platform/android) has been
modified separately, as part of the normal WebKit merge process.

Test added in http://trac.webkit.org/changeset/64613
Needs clearAllApplicationCaches() callback. See http://b/issue?id=2944196

Change-Id: I31655c363c93eada40d01123e9c14c0d03bdba7b
2010-08-24 12:15:54 +01:00
Chih-Chung Chang
27b257dbcd am 3a59ddc6: (-s ours) am dc2eabd1: Merge "Don\'t recycle native bitmap after the finalizer is called." into gingerbread
Merge commit '3a59ddc67c6ad33c01d36338603586f90d94e71b'

* commit '3a59ddc67c6ad33c01d36338603586f90d94e71b':
  Don't recycle native bitmap after the finalizer is called.
2010-08-23 19:56:34 -07:00
Dianne Hackborn
214a7fde36 Merge "Make Theme.Holo the default theme for new apps." 2010-08-23 18:53:06 -07:00
Dianne Hackborn
3e6d50cc48 Make Theme.Holo the default theme for new apps.
Also change Holo to have an action bar, instead of a title bar.

Change-Id: I45c2f06938509ae02cde99d1c06c228f86e8e3e8
2010-08-23 18:51:26 -07:00
Jaikumar Ganesh
d9a3d1c215 Merge "Add BNEP_SVC UUID for incoming tethering connections." 2010-08-23 18:33:18 -07:00
Jaikumar Ganesh
34536183f4 Add BNEP_SVC UUID for incoming tethering connections.
Change-Id: I90c24edfd133ac9fa89c3467383cd61fa23954c6
2010-08-23 18:32:03 -07:00
Adam Powell
208e3c586d Merge "Fix some issues with touch event splitting around event timing" 2010-08-23 18:20:56 -07:00
Adam Powell
816c3be1d7 Fix some issues with touch event splitting around event timing
Change-Id: I15d04d226c218ad7b8a5fe43a55c33c3ade2128d
2010-08-23 18:00:14 -07:00
Jamie Gennis
8d920850c8 Merge "Add the setPreviewWindow camera HAL API to the camera stub." 2010-08-23 17:26:57 -07:00
Jamie Gennis
c8536d1952 Add the setPreviewWindow camera HAL API to the camera stub.
Change-Id: Ic669f9d5f5ae8f1fe5bd055f55aa4a18fa6d84cd
2010-08-23 17:25:55 -07:00
Jaikumar Ganesh
33696164ed Merge "Revert "Allow reliable detection of a message that is in use."" 2010-08-23 17:12:17 -07:00
Jaikumar Ganesh
ddb2bfeb6e Revert "Allow reliable detection of a message that is in use."
This reverts commit 6083d81ce4d67ec632962270fda64ebb9db0d5b1.
Reverting this because it causes runtime to reboot in a loop
if connected to a Bluetooth Headset.

copyFrom() needs to check for the introduced bit too.
2010-08-23 17:04:32 -07:00
Irfan Sheriff
9e6222f4c1 cache configured networks
Remove the sync-wait call into state machine for
fetching configured networks

Bug: b/2876746
Change-Id: I4434627abb78f7112fd613008c4c77374ac1b966
2010-08-23 16:32:24 -07:00
Irfan Sheriff
d9df0124de Merge "Clean up synchronous calls" 2010-08-23 16:11:42 -07:00
Irfan Sheriff
d8134ff9d8 Clean up synchronous calls
We dont plan to have asynchronous versions of the existing
synchronous calls since we have added more powerful
asynchronous calls. Remove functionality to check for
synchronous calls.

Also, remove unused sync call for fetching status

Change-Id: I2982cb7b2aabc88a63289d49686a6e3645085263
2010-08-23 15:50:39 -07:00
Jamie Gennis
69d719662a Merge "Change the framework to use the new camera preview path." 2010-08-23 15:16:20 -07:00
Wink Saville
8da31dc8bf Merge "Allow reliable detection of a message that is in use." 2010-08-23 15:00:23 -07:00
Jamie Gennis
85cfdd0112 Change the framework to use the new camera preview path.
This change makes the camera HAL interface take an ANativeWindow interface from
which all the camera preview buffers will be allocated.  The framework code
running in application processes now passes a Surface object rather than an
ISurface to the camera server via Binder when setting the preview surface.  The
camera server then forwards that Surface object (which implements the
ANativeWindow interface) to the camera HAL, which uses it to communicate with
SurfaceFlinger to allocate the camera preview buffers.

Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
2010-08-23 14:31:30 -07:00
Andreas Huber
7fdaa2329e Merge "Account for the _ADRENO constant being moved." 2010-08-23 14:08:02 -07:00
Jamie Gennis
c6c9b496aa Account for the _ADRENO constant being moved.
Change-Id: I443e2028c06f8b03e864525365c5c38de79314fe
2010-08-23 14:03:49 -07:00
Chet Haase
4addc005ae Merge "Adding animation facilities to simplify layout transitions" 2010-08-23 13:54:07 -07:00
Jaikumar Ganesh
7f656e0961 Merge "Add Tethering class bit check." 2010-08-23 13:22:38 -07:00
Dima Zavin
7f81d4cbf1 Merge changes Ic94c18a6,Iff770de1,Ifed6b4dc
* changes:
  libstagefright: enable tegra hw audio decoders
  libstagefright: Enable tegra hw video decoders
  libstagefright: Enable tegra hw encoder
2010-08-23 13:18:58 -07:00
Chet Haase
602e4d3824 Adding animation facilities to simplify layout transitions
Change-Id: I70992a0dff6a75727f51abcfdfc7d7f2c2a8c101
2010-08-23 13:01:06 -07:00
Vasu Nori
81b5db042b Merge "weird java bug. bug:2941509" 2010-08-23 12:41:35 -07:00
Andreas Huber
d5350764c9 Merge "Squashed commit of the following:" 2010-08-23 12:31:59 -07:00
Andreas Huber
e3c01832fc Squashed commit of the following:
commit 35cc68814a9537c31fde146e171e7b0bbdfe211e
Author: Andreas Huber <andih@google.com>
Date:   Mon Aug 16 08:48:42 2010 -0700

    Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else.

commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 13 13:56:44 2010 -0700

    The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise.

commit 684972074b74318bdcb826ed9b5b0864d2d2e273
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 13 09:34:35 2010 -0700

    A first shot at supporting the new rendering APIs.

Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
2010-08-23 12:30:24 -07:00
Gilles Debunne
27113f8646 Merge conflict due to wrong import paths.
Change-Id: I3bba20b26036de53b29bb0b30885fe33832ba3e3
2010-08-23 12:09:14 -07:00
Vasu Nori
9a8bc78da7 weird java bug. bug:2941509
Change-Id: I70edabbdb5c715018227958b74fa1ac4e4df3f88
2010-08-23 12:07:00 -07:00
Wu-cheng Li
6c32677db3 am caaf7fe3: am 271c1bfd: Merge "Handle the camera open failure better." into gingerbread
Merge commit 'caaf7fe3a407c764f643585d050c16f5fb56503c'

* commit 'caaf7fe3a407c764f643585d050c16f5fb56503c':
  Handle the camera open failure better.
2010-08-23 12:02:21 -07:00
Jeff Brown
a931e9a158 am 6bacd9c6: am 2f6d975b: Minor MotionEvent optimization.
Merge commit '6bacd9c6fb799f185be580a0596214b0ce998999'

* commit '6bacd9c6fb799f185be580a0596214b0ce998999':
  Minor MotionEvent optimization.
2010-08-23 12:01:46 -07:00
Jake Hamby
d218526bf6 am d457053a: am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread
Merge commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88'

* commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88':
  Cosmetic cleanups to SMSDispatcher classes.
2010-08-23 12:01:35 -07:00
Chia-chi Yeh
bb2c2c14ed am 3a91abcb: am d3aaad0e: Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread
Merge commit '3a91abcb4cd06751009c155bfdce6c0a15a704df'

* commit '3a91abcb4cd06751009c155bfdce6c0a15a704df':
  Use getMinFrameCount() instead of querying AudioSystem directly.
2010-08-23 12:01:18 -07:00
James Dong
37e2592f28 am 3540760d: am 0ea4ed3b: Don\'t drop a late frame which may lead to missing I frames in the MP4 file
Merge commit '3540760d1d68cc883122d44ab1d38f542fb646e6'

* commit '3540760d1d68cc883122d44ab1d38f542fb646e6':
  Don't drop a late frame which may lead to missing I frames in the MP4 file
2010-08-23 12:01:07 -07:00
James Dong
a75d87ffc4 am 177a7ad8: am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread
Merge commit '177a7ad825445acaeea38c48c74ad87db935d054'

* commit '177a7ad825445acaeea38c48c74ad87db935d054':
  Return error from MPEG4Writer stop() if the check on codec specific data failed
2010-08-23 12:00:44 -07:00
Mike Lockwood
8e1441f0b5 Merge "Tethering: Delay 1000ms before processing USB disconnect events" 2010-08-23 11:59:47 -07:00
Mike Lockwood
6eef5c6876 Tethering: Delay 1000ms before processing USB disconnect events
On some devices, switching the USB configuration to enable RNDIS can
result in multiple USB disconnect/reconnect events being generated.

Change-Id: Id0bfe54293bd51211f84976be2d72f8b1ad0100d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-23 14:50:49 -04:00
Jaikumar Ganesh
332058050a Add Tethering class bit check.
Change-Id: Iaa87c91c4b3db3b77c2e6c4f559fa2e438c9c247
2010-08-23 11:50:32 -07:00
Gilles Debunne
5989f4edc5 Merge "resolved conflicts for merge of a842d143 to master" 2010-08-23 11:42:24 -07:00
Dima Zavin
30ba6cb915 libstagefright: enable tegra hw audio decoders
Change-Id: Ic94c18a6a6df8e0370dc28634f95561056ed2d02
Signed-off-by: Dima Zavin <dima@android.com>
2010-08-23 11:10:03 -07:00
pgudadhe
6ad2c357c3 libstagefright: Enable tegra hw video decoders
Change-Id: Iff770de1369e57e7833a8cfa9a30955030d9974c
2010-08-23 11:09:13 -07:00
Alex Sakhartchouk
a1f1174b39 Merge "Renderscript samples. Resolving name conflict in model viewer. Adding fov projection matrix function. Adding helper methods for blending." 2010-08-23 10:37:27 -07:00