Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp
* commit '8b61b68b648985df37197de204398f608c4ad8b1':
Only install after MCS success
If MCS dies in the middle of a call during install, only proceed if the
call was successful. Otherwise wait for the max retries to be reached
and run the failure handling code there.
Change-Id: I00a27ea91046ea6521a3cff5e5ffe2c71b2b5bb4
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp
* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
StrictMode: time violations in Binder calls
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp
* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
Added damr box for AMR (NB and WB) sample entry
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.
Bug: 2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp
* commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
Lower the lower bound for max file duration check
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 '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916' into gingerbread-plus-aosp
* commit '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916':
Fix a bug that prevented the creation of EGL shared contexts.
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 '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 '55a76dd8d9996c1e93762d7611789aea696d536c' into gingerbread-plus-aosp
* commit '55a76dd8d9996c1e93762d7611789aea696d536c':
fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
move change to gingerbread.
Wait for broadcast even if the network state has been changed.
bug: 2863356
Change-Id: Ia78d1d6c2906371b56dfd4765845431047e9e9c0
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).
Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.
Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
