Mad butter

CS2: fix build error introduced when rebased on the toroplus data fix

commit 94fed59bae81266f9f960c0b25d859ebbbc7e040
Merge: a19db0e 778777a
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Fri Dec 28 15:09:31 2012 -0500

    Merge remote-tracking branch 'cm/cm-10.1' into thenuts

    Change-Id: I62b8316ff877a3777a5f7b3f2e6f445b1ea69502

commit 778777acb3567c51681bb29c3ca081694ae70969
Merge: d262585 f676236
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Dec 27 12:38:58 2012 -0800

    Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/frameworks/native into aosp

commit d262585108ecede466678a84ddb3cb190935b12e
Author: Bumble-Bee <bigbeeshane@gmail.com>
Date:   Thu Nov 29 16:23:07 2012 +0000

    Add setOrientation back

    	this is needed for some tegra ICS and JB_MR0 prebuilts

commit 18aefe944472f2def2ace61a46f5002773413b43
Author: Mike Kasick <mike@kasick.org>
Date:   Wed Oct 31 18:53:58 2012 -0400

    dumpstate: Squash fixes from CM 10.0

    commit ba3723de8d13126027706bbbe6f9657da231b9bd
    Author: Mike Kasick <mike@kasick.org>
    Date:   Wed Oct 31 20:31:05 2012 -0400

        dumpstate: Fix calls to su to specify a shell command

        Superuser's su requires that shell commands be specified with the "-c"
        option.  Fix calls to su to explicitly specify this option.

    commit 78cd73fce82fd0b5ee98a6136c847932ba8c636b
    Author: Mike Kasick <mike@kasick.org>
    Date:   Wed Oct 31 18:53:58 2012 -0400

        dumpstate: Skip subsequent showmaps if the first run fails.

        dumpstate takes over six minutes to run as each call to "su" (which
        dumpstate uses opportunistically on states that require root privileges to
        access) takes approximately one second to process.

        The vast majority of these "su" calls are made to "showmap", which is
        called for every running process.  These calls nearly always fail, either
        because dumpstate is denied root access, or because "showmap" isn't
        installed.

        This greatly speeds up the dumpstate process by skipping subsequent
        "showmap" attempts if the first run (on process init) fails.

    Change-Id: Ibdfa996afff541dc30251da7ab01ac4987ae2ebc

commit 6efc967ff5e0bb33a9116aee9846b041b80d0594
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Thu Nov 22 23:49:35 2012 +0000

    Revert "remove support for HWC < 1.0"

    This partially reverts commit 30bcc61431d8e3bef779472dd52a7b156dcaba09
    and updates to the current API. Tested on 0.1 blobs from Tegra2/3
    and OMAP3/4

    Change-Id: I43cee8852b266d68d1edefbe7ac988b9dbcf7227

commit 0a70c9c72dcce36e2a43937506af289c870707d7
Merge: 49e4bcb 5bb8917
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Wed Dec 12 14:52:44 2012 -0800

    Merge "surfaceflinger: odd hw rotation (90/270) patch for swapping width/height" into mr1-staging

commit 49e4bcbf733c909b369dc62cc0902fb38dea1c67
Merge: a0a706b 9a3063e
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Tue Dec 11 05:06:18 2012 -0800

    Merge "binder: Add MemoryHeapBaseIon" into mr1-staging

commit 9a3063ed1b718190845ab1326d27261a5eebfd11
Author: codeworkx <codeworkx@cyanogenmod.org>
Date:   Tue Dec 4 18:51:36 2012 +0100

    binder: Add MemoryHeapBaseIon

    Source:
    http://git.insignal.co.kr/samsung/exynos/android/platform/frameworks/native/commit/?h=exynos-jb&id=dc4cd25cc41e4358debd0c7d1a2706d208a58df6

    Change-Id: Ib06cc37a2a25c78a061ee2bad48eec2d01b07833

commit 5bb8917449681b0e9075e9b83244c95bbec117ac
Author: Hashcode <hashcode0f@gmail.com>
Date:   Mon Dec 10 16:33:53 2012 -0800

    surfaceflinger: odd hw rotation (90/270) patch for swapping width/height

    This patch works in addition to the following commit
    re-implementing ro.sf.hwrotation:
    https://github.com/CyanogenMod/android_frameworks_native/commit/7d283431efffc4402cb1a6cacf5da64729c883bb

    When using values of 90 and 270 for ro.sf.hwrotation the
    LCD width and height also need to be swapped to display properly.

    NOTE: This patch does not fix the initial startup of bootanimation

    Change-Id: Iab9de66348967a378dd73a41bc96d632f750386c
    Signed-off-by: Hashcode <hashcode0f@gmail.com>

commit a0a706b8258863757cf2e3664c8fddaa794a0514
Author: Andrew Dodd <atd7@cornell.edu>
Date:   Mon Dec 10 08:26:54 2012 -0500

    DisplayDevice: Backwards compatibility with old EGL

    From 4.1 to 4.2, the display subsystem was reworked to
    use SurfaceTextureClient/BufferQueue instead of
    FramebufferNativeWindow for the framebuffer itself.

    Unfortunately, some legacy EGL libraries make assumptions
    that any framebuffer device will be FramebufferNativeWindow.

    These EGL libraries will fail when used in 4.2 as if the
    framebuffer is not FramebufferNativeWindow, they will
    try to dequeue more than one buffer at a time, which
    will cause a hang of the graphics subsystem.

    This allows use of FramebufferNativeWindow to keep
    legacy EGL implementations happy.  Confirmed EGL
    implementations that need this include but are
    not limited to:

    Set BOARD_EGL_NEEDS_LEGACY_FB to use

    Tegra2/3 ICS EGL
    Mali400 ICS EGL (Allwinner A10)
    Mali400 Jellybean (4.1) EGL (Samsung Exynos4)

    Original implementation by OndraOrg of XDA:
    http://forum.xda-developers.com/showpost.php?p=34469675&postcount=19

    Change-Id: I74005cf6753b3c9bfb4c1e32fb641f5167787917

commit a1aa229340e805da8cbd1edaaf2e6fcb380a1070
Author: Pawit Pornkitprasan <p.pawit@gmail.com>
Date:   Wed Dec 5 12:40:45 2012 +0700

    Sensor: Add RotationVectorSensor2

    (ported from 4.1)

    Some ICS apps (namely, Google Maps) expects a rotation vector to be
    available. Newer devices, this is provided by either Android's
    sensor fusion (requires Gyro) or by hardware sensor fusion (MPL).

    Older devices will lack this virtual sensor and compass in Google
    Maps will not work. To fix this, we can provide our own rotation
    vector sensor by converting the values from the orientation sensor.
    (They are basically the same information in different formats.)

    Thanks to Unhelpful for the help with related math.

    Change-Id: I39489b3a5ce7c7d890768614357f32cc491bd6d9

commit 9cdde0d0b41e4d0d1187e7b664f97b00a9a3e4af
Author: codeworkx <codeworkx@cyanogenmod.org>
Date:   Mon Dec 3 22:16:56 2012 +0100

    libui: exynos4: apply FIMC usage flag on format HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED

    Change-Id: I8a98e593cb60d0843e83a5e431142410e26d82e7

commit f792059f3a98e55435b221c899c04dbb4103aef7
Author: codeworkx <codeworkx@cyanogenmod.org>
Date:   Tue Nov 27 11:58:03 2012 +0100

    GraphicBuffer: exynos4: set FIMC1 usage bit on samsung specific formats

    Change-Id: Ia8cde7e594f8be464ef15eaae453872ee5aa2768

commit c49d996166e49a82266b488a58779ecff5b2a06d
Merge: 7db063a 1e5774b
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Mon Nov 26 15:43:00 2012 -0800

    Merge "exynos4: ui: define USAGE_HW_FIMC1 to support gralloc" into mr1-staging

commit 7db063a544bb1acd902f7c752f9e769c5bc0caf9
Author: codeworkx <codeworkx@cyanogenmod.org>
Date:   Mon Nov 26 23:49:25 2012 +0100

    ui: exynos4: getphys is common

    Change-Id: I1dc9c2ced0700072e7c30c8435676873b10c7026

commit 7d283431efffc4402cb1a6cacf5da64729c883bb
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sat Nov 24 23:11:49 2012 +0000

    surfaceflinger: Reimplement hwrotation

    Change-Id: Ia26bb36b5b6de132af49c272c4472ad2703afbda

commit e657227f88844f31da7f9a11c783c84bdbbc80bd
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Nov 26 02:23:06 2012 +0000

    libgui: Add ICS/MR0-compatible client::createSurface constructors

    Change-Id: Ia5b04d93320c65ac32a92cbd93daa6a64e6cee1c

commit c0f52aabe2ab8c859c4f3a790f6c8b0ec40107ba
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sat Nov 24 22:39:21 2012 +0000

    Revert "Revert "Compatibility work around for bad graphics driver dependency.""

    This reverts commit 38b657265ccc5ae45bd7860a68b0d9373b47a2f3.

    Change-Id: If350d73839f1ed5e01af4299d44837e619d14d66

commit 1e5774b19126dfe844580e32d8692bb386edc2ea
Author: codeworkx <codeworkx@cyanogenmod.org>
Date:   Sat Nov 24 14:51:44 2012 +0100

    exynos4: ui: define USAGE_HW_FIMC1 to support gralloc

    Source:
    http://git.insignal.co.kr/samsung/exynos/android/platform/frameworks/native/commit/?h=exynos-jb&id=5179fef67cadaa10d72cfe6764629565bc9a1e4e

    Change-Id: Id194446eb332869f677dfb7e94c73aa3f52ee4b0

commit 2b77c3e473c4347e34d2fae9dcf32366fd629b33
Author: codeworkx <codeworkx@cyanogenmod.org>
Date:   Fri Nov 23 22:01:55 2012 -0500

    exynos4: getphys implementation on buffermanager for samsung omx

    Change-Id: Iee665f56aaf601479d796703db983ca5fce9c5c3

commit f2108ee9f769c7c43aa42d7ba6e7989d891e3eb5
Author: Robert Burns <burnsra@gmail.com>
Date:   Fri Nov 23 11:54:40 2012 -0500

    Revert "Revert "A vendor ril depends on a native screen shot code.""

    This reverts commit 94f261556cc5f4aa628cd5b71bf923b583f6e3c3.

    Fixes RIL on toroplus

commit 11b423f953b0fae673231cc4b30caa992d4f7b8b
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Fri Jul 13 23:35:46 2012 +0100

    Revert "get rid of MemoryHeapPmem"

    This reverts commit 7a7524810a0950c1c2b18014a8f1c637275165c4 and
    makes MemoryHeapPmem conditioned to BOARD_NEEDS_MEMORYHEAPPMEM

    Change-Id: I2f38340984ba87d6970d17ec944e3faded4132c8

Change-Id: I4766d8e2f0ec74a6656fc1ea546a89f1540377fa