Merge commit '14854820eac895a925791fb41ccd330447fd4f02'
* commit '14854820eac895a925791fb41ccd330447fd4f02':
Add a configuration option to turn on the screen when you unplug the device.
Merge commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp
* commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58':
Add versionCode and versionName to dumpsys packages
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp
* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
Remove dead code, and make the animation a setting.
turn off the electron beam
Merge commit '5be893a71aa72f54660496dd01cfad66adb86b8f'
* commit '5be893a71aa72f54660496dd01cfad66adb86b8f':
Don't throw when userActivity fails because of the permission check.
When the storage is emulated, we don't want to install ASEC containers
to it. This adds the API to check when the external storage is emulated
and uses it to check whether or not to install packages to the external
storage in an ASEC container.
Bug: 3024387
Change-Id: Ia0318aca9e4938a4897deaada5603a4c7c1d0f48
Bug #3081600
The OpenGL renderer in libhwui uses a single EGL context per process and
thus create it with an RGBA 8888 EGL configuration. To ensure that all
windows are compatible with this configuration, this change modifies
the window manager and SurfaceFlinger.
The window manager now checks the window's flags and if the window is
hardware accelerated, it forces the window's pixel format to be
translucent when creating the surface. The window itself is still
marked as opaque if we know that the window will be opaque on screen.
This keeps existing optimizations in place.
Similarly in SurfaceFlinger, a translucent Surface can now be created
with the Surface.OPAQUE flag, indicating SurfaceFlinger that the surface
does not require blending, despite its RGBA 8888 configuration.
Change-Id: Ic747b6b12564ba064412d842117880fcc199eb7c
Merge commit 'd54a97a0efc5cdd8088a277b0e6787ea24711e0c'
* commit 'd54a97a0efc5cdd8088a277b0e6787ea24711e0c':
Fix time zone info in kernel is nothing after reboot
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.
Cherry pick of b931a1b4 from gingerbread into master.
Change-Id: I700a5f07b8b227878cea9437a289a45a245c0424
Merge commit '779d1778b6147ee1b57428af234d1498a26f031e'
* commit '779d1778b6147ee1b57428af234d1498a26f031e':
Include debugger connection status in error entry
Merge commit '41aabeb51305d19747687f246080f44fc2a74435'
* commit '41aabeb51305d19747687f246080f44fc2a74435':
Added more robust tracking and cancelation of events.
Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp
* commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45':
OBB: rearrange to be entirely asynchronous
Merge commit '1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp
* commit '1da8d4d1697cec871dea8c30dad67e90db10bde6':
Fix an event injection bug when the policy is bypassed.
Merge commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e' into gingerbread-plus-aosp
* commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e':
Grant URI permissions to the MCS
Rearrange structure of MountService handling of OBBs to be entirely
asynchronous so we don't rely on locking as much. We still need the
locking to support dumpsys which has been improved to output all the
data structures for OBBs.
Added more tests to cover more of the error return codes.
Oh and fix a logic inversion bug.
Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.
Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp
* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
Add a configuration option to turn on the screen when you unplug the device.
When the PackageManagerService is asked to install from a URI, it might
be explicitly granted the permission to read from the URI content
provider. We need to pass along these permissions to the
MediaContainerService (DefaultContainerService) to ensure the MCS can
read from the content provider.
Change-Id: Ie7ddaeb638af82b60792a4c3f8c99e1e8eef1916
Several people are seeing odd behaviors around backup/restore at present.
Enable expanded logging to help pin down exactly what is happening.
Change-Id: I95ca013017cb07e633f2ba765583de3cf0e056af
Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp
* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
Don't throw when userActivity fails because of the permission check.
Merge commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe' into gingerbread-plus-aosp
* commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe':
Go one day into 1970 for timezone code.
Merge commit 'ce2f1909c74a1b90995f06a865d21260b062300b' into gingerbread-plus-aosp
* commit 'ce2f1909c74a1b90995f06a865d21260b062300b':
On boot, advance time to at least 1970.
Otherwise various Java APIs start doing their documented "correct"
thing, which is to fail.
Bug: 3081605
Change-Id: I90f8cde745d2ddab78419e37f60eea1e81a58127
Merge commit '748b413e94c73b760c63a03126df2c4712a1ae05'
* commit '748b413e94c73b760c63a03126df2c4712a1ae05':
GPS: Do not call sGpsInterface->init() multiple times
Merge commit '681f327e839a40a4d55d3567af341b9e90f62378'
* commit '681f327e839a40a4d55d3567af341b9e90f62378':
Fix retaining of granted permissions when updating of system app.
Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'
* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
Maybe fix#3076572: phone process crashes in SipService, trying to get wifi lock
