Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into froyo-plus-aosp
* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
Add a method to hide/show a SurfaceView's surface.
This can be used to move a surface offscreen to avoid the cost of compositing it.
This preserves the window and therefore the OpenGL context when used in h/w
accelerated apps.
Change-Id: I280295376601b17989d0fc8a271af66650016f09
On branch fix_sdk
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: core/java/android/app/KeyguardManager.java
Change-Id: I56848db098822536f0ac32efc8f0eb1d725bf6f9
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp
* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
Fix 2737842: disable keyguard API when device policy is enabled.
This fix disables KeyguardManager's enable/disable API when any
device policy admin requests a policy that enforces a password.
Change-Id: Idb1da16b14ed8963142f7b1f62d2b060d84ffa65
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp
* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
Make the DUN apn data secure.
Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).
Also made the "require-dun" setting secure-setting overridable.
bug:2736390
Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
If an Exception occurs when storing the file treat this as an error
and always fail to try to prevent corrupted pictures to be stored to
the file system.
Close files if they were opened, the caller might want to perform other
file operations on the file and if it is still open these may fail.
Change-Id: Ic68596b5c745bbe413096c22684c388e853a7643
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp
* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
Comment-only change to add documentation for FileObserver
The Javadoc had a missing close <code> tag and also failed to mention
the "start" parameter in the doc.
Change-Id: I861d6646e82e1d49f23a09de8b68a61f81689f83
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp
* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
Make the NTP Cache max-age gservices-settable
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp
* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp
* commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49':
docs: revise webview description and add info for targeting screen densities
This is to avoid flashlight apps that had been using reflection to access
this API after this class was removed after eclair.
Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e
Signed-off-by: Mike Lockwood <lockwood@android.com>
