Revert "Revert "Add SCENE_MODE_OFF support for Camera framework""

This reverts commit 12538695a741670c094ca31efab1c275a808ba38

Does not break builds: Example of a successful build here: http://jenkins.cyanogenmod.com/job/android/7513/
Always set buffers orientation when setting the qcom camera preview window

Fixes the rotated preview on TouchPad

Change-Id: I9763dff8c06f445d905b9f21fb5f899995f816ed
Merge "Revert "Revert "Add SCENE_MODE_OFF support for Camera framework""" into ics
audio: fix inputClientId for ST-E audio support

This fixes a uninitialized parameter to getInput() which is needed for
audio recording.

Change-Id: I9a8c2580f847e9a581bda3ccef1cd3b6887f3e5e
AudioFlinger: remove readInput for ST-E audio support

readInput is not implemented and causes audio recording to hang.

Change-Id: I4f9e6747a13df28e54a3d425f30373d336189775
Merge "Always set buffers orientation when setting the qcom camera preview window" into ics
ST_ERICSSON: support for latency

manualy ported from
commit e8cfc22c08e32b463186362ed40abb4d34eedca8
Author: Naveen Agarwal <naveen.agarwal@stericsson.com>
Date:   Thu Apr 5 21:06:59 2012 +0000

    Add support for update of audio output latency on Snowball

    Adds mechanisms enabling AudioPlayer to receive updated latency values
    for the audio output. The possibility to update the latency value is
    needed because the latency values for some devices (e.g., A2DP devices)
    are not known until they have been opened. Latency value updates will
    also occur when output device is exchanged on-the-fly during playback
    (e.g., audio output is moved from headset to A2DP device).

    This patch modifies the MediaPlayerService::open() function declaration
    which is part of an Android internal interface. Although, this is a
    backward compatible change since only a default parameter is added.

    ST-Ericsson ID: 372587

    ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-12221

    Introduce backward compatible changes to exposed interfaces

Change-Id: I0ac7eb7647d00c92719078aa5260d37fea795f15
STE: ux500 hdmi support

Change-Id: I90ca2316ca006ad83de8b430cc1dadf7a887a9d8
Merge "ST_ERICSSON: support for latency" into ics
Fix build breakage on non-STE hardware

Change-Id: Ia9e655857b3661215952439a3a88b3dc95c94b64
ST_ERICSSON: Adding multimedia extension

adapted from
commit 151ce20c17e1a097a2edf5b467650941a1cc6287
Author: Patrik Ryd <patrik.ryd@stericsson.com>
Date:   Thu Apr 5 20:18:30 2012 +0000

    Adding multimedia extension

    More specifically:

    - Add support for ST-Ericsson native pixel formats and conversion to
    and from these formats.
    - The Khronos headers are out of date and Mali extensions are missing from
    the extension headers. GLES2/gl2ext.h has been updated with the missing ARM
    extensions.
    - ST-Ericsson audio support for multimedia.
    - ST-Ericsson video support for multimedia.

Change-Id: I716bdd850bc0e3ef783f7814e98e39c53f70d7e4
ST_ERICSSON: Adding multimedia extension part2

manual import from
commit 151ce20c17e1a097a2edf5b467650941a1cc6287
Author: Patrik Ryd <patrik.ryd@stericsson.com>
Date:   Thu Apr 5 20:18:30 2012 +0000

    Adding multimedia extension

    More specifically:
    - ST-Ericsson audio support for multimedia.
    - Support for FM Audio in framework.

Change-Id: Iea956cb398793023cf8e8c003089ae6aef7fb843
Merge "ST_ERICSSON: Adding multimedia extension" into ics
FM Radio: Add support for FM Radio in Android

Creating interface and framework for using FM Radio
RX and TX from different vendors.

Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
Change-Id: Change-Id: I1a71aed01bfffdddfabf1cdfbfa3707cb1ed016b

Conflicts:
	Android.mk
	core/java/android/app/ContextImpl.java

Conflicts:
	services/java/com/android/server/SystemServer.java
Smdk4210RIL: fix emergency dialing

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

Change-Id: I4ab536853a3ab43530f198e52a87b26e2f3a161a
Merge "FM Radio: Add support for FM Radio in Android" into ics
Merge "FM Radio: Add support for FM Radio in Android" into ics
Revert "FM Radio: Add support for FM Radio in Android"

This reverts commit ebeefec360f101e4ba690b2873344676307ab11e

Change-Id: I9fefa73151cb9a4afd6cb2fd2d84f293e083ae0a
Merge "Revert "FM Radio: Add support for FM Radio in Android"" into ics