Merge commit '2a5db6d4b389a1fb24f43f18b4207a5fad5296ca'
* commit '2a5db6d4b389a1fb24f43f18b4207a5fad5296ca':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Merge commit '432c5b6c1d4181194cb82a14107b6d10105231a9' into gingerbread-plus-aosp
* commit '432c5b6c1d4181194cb82a14107b6d10105231a9':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Merge commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread
* commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Merge commit '8e258000e86faa5dd0009caa5823119116ef5dec'
* commit '8e258000e86faa5dd0009caa5823119116ef5dec':
Fix a bug that prevented the creation of EGL shared contexts.
Merge commit '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916' into gingerbread-plus-aosp
* commit '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916':
Fix a bug that prevented the creation of EGL shared contexts.
The goal here is to avoid the dalvik.vm.* property explosion by
having a single property that takes an arbitrary collection of Dalvik
command-line options. This is intended for testing of various
configurations by the Dalvik team, not industrial use.
Options should be separated by spaces, e.g.
adb shell setprop dalvik.vm.extra-opts "-showversion -Xmx4m"
will print the version banner and set the heap max to 4MB, which won't
get you very far.
The extra-opts options will appear last, which allows them to override
values set earlier (like the heap max).
Bug 2838629.
(cherry-pick from dalvik-dev branch)
Change-Id: Ibcbb1b62367cf2152798583e8722ef7e461ad19a
Rename all stk classes, comments and variables into cat classes.
Cat (Card Application Toolkit) is the common class that has
functionality of both Stk and Ccat.
Change-Id: Id0b99d0d9f4b0ce49adcb436060f13d5341ab8ab
Merge commit '92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp
* commit '92e847ed8e455dca3b2d33d92999e3960404d9af':
Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Modified types of some arguments and returned values of the Equalizer class from int to short
to match those defined by OpenSL ES SLEqualizerItf interface.
Also fixed a problem with set properties in equalizer engine implementation.
Change-Id: I75894bad0cb67b01c18ca5e22f9687e75ee491b8
Merge commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d'
* commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d':
Clear preferred activities when home process crashes
Merge commit 'a4fd0078d138b433d2250a74833ee3cc6424143a' into gingerbread-plus-aosp
* commit 'a4fd0078d138b433d2250a74833ee3cc6424143a':
Clear preferred activities when home process crashes
If the "default" Home application has been replaced with
a third-party app that is repeatedly crashing at start-up,
there is no way for the user to clear the preferred activities
or uninstall the bad application. If we clear the package
preferred activities when the application crashes, the user
will be prompted with the ResolverActivity at the next boot
and can try using the app again or choose to use another
Home application.
Change-Id: I8ba8e95e6752916d50515d96c117d3084fa980fd
Merge commit 'eb248a58fabac31873982e4f389ba81981f4041f'
* commit 'eb248a58fabac31873982e4f389ba81981f4041f':
fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
Merge commit '55a76dd8d9996c1e93762d7611789aea696d536c' into gingerbread-plus-aosp
* commit '55a76dd8d9996c1e93762d7611789aea696d536c':
fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
