Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/frameworks/native into aosp
ui/sf: Add support for exynos HDMI

Change-Id: I27b34e95c04750e3dd321a2183b6cc1d89f29b5d
sensors: Add dummy light sensor

Some devices have a sysfs toggle for the lightsensor instead of
passing the LUX values for userspace processing; for those,
use BOARD_SYSFS_LIGHT_SENSOR:=<sysfs path>

This is necessary for the rest of userspace to recognize its existence
and toggle it for auto-brightness. It doesn't generate actual light
values, though; all backlight adjustments are made in-kernel.

Change-Id: I0e546b4740720bd34d1e1d85a96b295fcc697106

sensors: dummy ls: set unique handle

handles and types are usually the same, but it's not mandatory.
Sony DASH use custom handles, and the previous assumption broke
Proximity sensor on Sony devices.

Change-Id: I954e13765f42341e6b5393a12556f6a007c4e494
sensordevice: Dummy ALS: Solve fortified libc warning

convert sprint to snprintf, the size of the writes is always known

Change-Id: I53ee36b67544ac25de7e5c05ce90b6817c8a9c92
JB_MR1: native/libs/ui: Adding fix for conf 2.0 seg faults

function call to cancelBuffer was resulted in seg-faults on conf 2.0.
Setting function pointer of cancelBuffer to null in order to select
correct path of execution.
CRs-fixed: 383715

Change-Id: I6de8355febaea86ded63f33a582c787fef862193
FM Radio: Add support for FM Radio in Android

moved permissions to frameworks/native

Change-Id: I27ded70f7bc116a1b1c9cff2383c4899afe746ec
SurfaceFlinger: Change to support framebuffer flip for 2D blitters

- Surfaceflinger does not flip framebuffers when there are
  no layers marked for HWC_FRAMEBUFFER
- This change checks for the HWC_BLIT flag and will request a flip
  to a new FB_TARGET buffer even if there are no FRAMEBUFFER layers

Change-Id: I1cb44389a05c9ec049d7f0d39c288feccb11a91c
SurfaceComposerClient: bring back getDisplayWidth, Height & Orientation

enable it with either ICS_CAMERA_BLOB or MR0_CAMERA_BLOB CFLAG

Change-Id: Ieb5d36ad2a87ed1f0aa28ae3afbd5d48c880d6ab
Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1
libgui: Use fences for all QCOM targets

Change-Id: I32d6d8c8c06a2541aa655fb8f2a99c2c0ac0f64b
sensorservice: Add legacy sensors fusion.

This change allows devices with accelerometer & magnetometer but
without gyroscope to still get virtual sensors such as Gravity,
Linear Acceleration and Rotation Vector.

Change-Id: Ibb90b70845c766ab52c843557446e34649a7d6d9
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/native into 1.1

Android 4.2.2 release 1

Conflicts:
	libs/ui/GraphicBufferAllocator.cpp

Change-Id: Id60a6580bf5a3ba04f8e1e2b1b950e0b93888166
GC triggering performance optimizations

Copy the correct starting heap size at process init.
Interfaces to set GC/managed heap parameters.

Change-Id: Ifbc6194310c61c05206f1d425ba5b4ebf8658141
Reset the FrameNumber for dropped frame in async mode

In Async, reset the framenumber of frames dropped by the BufferQueue.
This allows the client to dequeue and use this frame before the other
queued frames which may be with the MDP.

CRs-fixed: 448606
Change-Id: Icaabf77b55a7275dc98ba1fdfba89508feb92145
Revert "SurfaceFlinger: Change to support framebuffer flip for 2D blitters"

This reverts commit f442ef1dfc17ca56b88c68c318599942f94e1d68.
Add support for custom buffer sizes.

Add native window properties NATIVE_WINDOW_SET_BUFFERS_SIZE to the
perform function of SurfaceTextureClient to set the user defined size
of graphic buffers.

Change-Id: I1dc2203990a3641fbb9ddab9a86f7e9017f05270
libgui: Add support to update buffer geometry.

Add native window properties NATIVE_WINDOW_UPDATE_BUFFERS_GEOMETRY
to the perform function of SurfaceTextureClient and SurfaceTexture
to update the width, height and format of the buffer dynamically
from the client before queue buffer call.

Change-Id: I62447fcf523b507d534085cd0835f55a978c4ead
ui: Allocate the custom buffer size in the failure case also

The custom buffer size was not being honored if memory allocation
failed in the first pass.
Also - removing an unnecessary check.

Change-Id: Ie501b2dda3843454405fec05fc898fec5912bd06
Don't use fence sync for qcom legacy

Change-Id: Ice64233a25edee763a36a3ba34230d1360a0d610
native: Add custom 32-aligned NV12 colorformat

- Add color format which is NV12 + 32 aligned stride and slice

Change-Id: Iea804c2642ffad98890cbfe2979d56443f07ffdc