Merge commit 'b0fbb7cc15a2b383b4fe1dde8117254b2056573b' into eclair-mr2-plus-aosp
* commit 'b0fbb7cc15a2b383b4fe1dde8117254b2056573b':
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
Merge commit '35e8de89551825ca19f069d029757ecd852661a4'
* commit '35e8de89551825ca19f069d029757ecd852661a4':
When requesting the href of a link, also request the link's text.
Merge commit '0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336' into eclair-mr2-plus-aosp
* commit '0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336':
When requesting the href of a link, also request the link's text.
Provide a new method, GLSurfaceView.setEGLContextClientVersion. Clients
call this method to define which level of OpenGL ES support they want.
This method only affects the default behavior of GLSurfaceView. If clients
have supplied their own EGLContextFactory or EGLConfigChooser then they
are on their own if they want to create an OpenGL ES 2.0 context.
This API is currently hidden.
Update the gl2_java test to use this new API.
Update the gl2_java test's AndroidManifest.xml file to indicate that
it requires OpenGL ES 2.0.
e090281428cbd1114f4ae2f10755013cea09cdb5 Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
0e5bb7f1c9558bcf76af4f31dd5a11e78bcbdc9d PowerManagerService: Hold a wakelock while mProximityTask is queued
Change-Id: I8082b546467f839f53187534bb4264e59bd4a7db
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808'
* commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp
* commit '6a942dbe51b52ce41903e236d5db294274bb0dd2':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Merge commit 'efe676074b55867817c723e8232078810479906c'
* commit 'efe676074b55867817c723e8232078810479906c':
Solve the mutual interdependency problem between common and framework:
Merge commit 'b99c469e2bb96420ee3c57b351aa23dd4322852a' into eclair-mr2-plus-aosp
* commit 'b99c469e2bb96420ee3c57b351aa23dd4322852a':
Solve the mutual interdependency problem between common and framework:
Merge commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8'
* commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8':
Modify vCard exporter code so that it does not emit non-Ascii type.
Merge commit '11f5fe94a03405ccc644bfc0870bbb740ed39145'
* commit '11f5fe94a03405ccc644bfc0870bbb740ed39145':
Attempt to fix the build server build: make the common library
Merge commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187'
* commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '41029cf413abbfdf004e04f192a440e457701c47'
* commit '41029cf413abbfdf004e04f192a440e457701c47':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
* changes:
Solve the mutual interdependency problem between common and framework: Have framework include the common source files directly when building, then build common as a static library separately (depending on framework, like everything else).
* changes:
Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource to define how the two new audio sources behave when used on devices that don't support them.
Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp
* commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05':
Modify vCard exporter code so that it does not emit non-Ascii type.
Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen.
Clear the "waiting for proximity sensor to go negative" state when the power key is pressed.
Part of the fix for b/2243198 (Black screen lockup after ending call)
Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Have framework include the common source files directly when building,
then build common as a static library separately (depending on
framework, like everything else).
Goes with a companion change to build/core/pathmap.mk.
Merge commit 'b9386ed929b72308cbfc68d2833a13aeda38f431' into eclair-mr2-plus-aosp
* commit 'b9386ed929b72308cbfc68d2833a13aeda38f431':
Attempt to fix the build server build: make the common library
