Reconcile with carbon

Squashed commit of the following:

commit e1c544a9410b322bb21059a9acd9463d6d6e8007
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Sat Apr 6 17:07:26 2013 -0400

    Use OUR charger

    Change-Id: I5543bd56e931b47c0c1867c9563aea988de5e591

commit 2b38dcaf56f532a071f20f4cc39abfd82066207d
Merge: 3c5727a 6494c99
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Sat Apr 6 17:05:20 2013 -0400

    Merge remote-tracking branch 'carbon/jb2' into the hive

    Change-Id: If5446b0d57f2c4c4de821bff44616dbf82ffb940

commit 6494c99fb090f807b78495d7b7cea3514ef3f269
Merge: 3584bd4 823c688
Author: nocoast <voteforpedro8@gmail.com>
Date:   Fri Apr 5 08:44:10 2013 -0700

    Merge pull request #12 from CyanogenMod/cm-10.1

    Cm 10.1

commit 823c688376292596edaa2846a005d1398a3c8d12
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Fri Mar 22 21:39:09 2013 +0000

    Fix the QCOM_BSP ifdef

    We only want this when the full BSP is enabled.

    Change-Id: I7bb7b0d274d1221c5bb566d4ac24419e1e134519

commit d33ce433dda9ac4edb69d37407c6c6eb335c3aee
Author: ChampionSwimmer <android@championswimmer.tk>
Date:   Tue Mar 5 00:36:05 2013 +0530

    add 8K 16K 32K 64K and 128K pagesizes in bootimage

    Ported from jellybean (was Change-Id: I4bc74ad6b0a473de68c906422bcd7eac00c89793)

    http://review.cyanogenmod.org/33216

    Signed-off-by: ChampionSwimmer <android@championswimmer.tk>
    Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

    Change-Id: I0ee608b74a1daefe536b9247f99368f3e043f93d

commit f7eba0c3a8779dd09f858871718166569694f9cc
Author: Mingming Yin <mingming@codeaurora.org>
Date:   Thu Dec 27 17:40:25 2012 -0800

    qcom-fm: audio: Add support for FM feature

    -Define audio stream for FM
    -Define audio source for FM RX and FM RX A2DP

    Change-Id: If24e4c32916f6614e3367b4c9f2cd828562e0347

    Conflicts:
    	include/system/audio.h

commit 3584bd4745486bde109a3e550c0d5ca8e16423bc
Merge: 976dd90 96f1188
Author: nocoast <voteforpedro8@gmail.com>
Date:   Fri Mar 22 08:24:33 2013 -0700

    Merge pull request #11 from CyanogenMod/cm-10.1

    Set permissions on io_is_busy node for interactive governor

commit 96f1188834d2aae0daf8e34fb28cabddd081df6c
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Mar 22 06:24:59 2013 -0700

    Set permissions on io_is_busy node for interactive governor

    Change-Id: I9dce40b0680fdb594f415aade22dbd92ebffa43c

commit 976dd90e92e7e59572bcd1fc9597fd4a2ae8af32
Author: nocoast <voteforpedro8@gmail.com>
Date:   Mon Mar 18 11:28:42 2013 -0500

    Revert "mkbootimg: support 8192/16384 pagesizes"

    This reverts commit 3f7b7053049213b2f44e47ad65f955d054373b0e.

commit 3261aaaee68a1c2514d09a32c5832efbb07df9aa
Author: Chris Dearman <chris@mips.com>
Date:   Thu Nov 15 13:05:48 2012 -0800

    Close adb_usb.ini after reading it

    Signed-off-by: Chris Dearman <chris@mips.com>
    Change-Id: I7d3ee8cbd54af206dac89225c438e6c7322c571f

commit 3f7b7053049213b2f44e47ad65f955d054373b0e
Author: Ithamar R. Adema <ithamar@upgrade-android.com>
Date:   Sun Mar 10 14:11:10 2013 +0100

    mkbootimg: support 8192/16384 pagesizes

    By now these sizes are very common, so make sure we support them.

    Change-Id: Ib1963fbabc4ec0b4623f2045a3cbeedffbad7ee8
    Signed-off-by: Ithamar R. Adema <ithamar@upgrade-android.com>

commit be99b05220c024d6e44c2e9e102d89715bb1512c
Author: Nick Kralevich <nnk@google.com>
Date:   Fri Mar 15 09:45:12 2013 -0700

    liblog: fix fd leakage

    File descriptors remain open across an exec unless FD_CLOEXEC is
    set.  Add O_CLOEXEC to the open() call to prevent file descriptor
    leakage.

    In particular, the following program will eventually run out of
    file descriptors:

    int main(int argc, char **argv) {
      printf("===== entering main =====\n");
      ALOGW("entering main");
      system("ls -l /proc/self/fd/");

      execv(argv[0], argv);
      printf("exec failed\n");
      return -1;
    }

    Change-Id: I5be43ab3b9f82a05f242b1f586454c50568af388

commit 1b50715c54f8113cb2347a752ee52aea81fd44a8
Merge: fad1cca 67e1cf2
Author: nocoast <voteforpedro8@gmail.com>
Date:   Tue Mar 5 07:52:15 2013 -0800

    Merge pull request #10 from CyanogenMod/cm-10.1

    Cm 10.1

commit 67e1cf2c42f684532ac7fde52b62c222966a6e2e
Merge: 61a20d6 a0900e2
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Mon Mar 4 08:03:37 2013 -0800

    Merge "init: create mountpoint for fuse" into cm-10.1

commit fad1ccaddd66b9b335e746a7004beb08bb34ffb7
Merge: 59850af 61a20d6
Author: nocoast <voteforpedro8@gmail.com>
Date:   Wed Feb 27 22:15:55 2013 -0800

    Merge pull request #9 from CyanogenMod/cm-10.1

    init: Check for symlinks with lstat() not open()

commit 61a20d6cb3029e166572bd7312db3d5d1d4a311c
Author: Andrew Dodd <atd7@cornell.edu>
Date:   Mon Jun 18 21:19:19 2012 -0400

    init: Check for symlinks with lstat() not open()

    Using open() with an O_NOFOLLOW flag will result in a file falsely
    being determined to be a symlink if the open fails for another
    reason.

    For example, a character device that isn't ready due to the
    underlying hardware not being initialized yet will fail to open()

    An example of this are any CG2900 device files prior to
    execution of ste-cg29xx_ctrl

    This uses lstat() instead of open() with O_NOFOLLOW to check
    whether a file is a symlink or not.

    Change-Id: Ie0d8d94b426c84c29b1b04d41a4cc15536cb307c

commit 59850af704288e72ea732dbed5c9a08b7652c5c2
Merge: fea3ce6 33bfa99
Author: nocoast <voteforpedro8@gmail.com>
Date:   Wed Feb 20 08:55:02 2013 -0800

    Merge pull request #8 from CyanogenMod/cm-10.1

    Cm 10.1

commit a0900e2aa508ceac871f95a0271822b9d3bb5483
Author: codeworkx <codeworkx@cyanogenmod.org>
Date:   Thu Jan 31 17:34:51 2013 +0000

    init: create mountpoint for fuse

    Change-Id: I8bd80bbcacc8f01ac4df17e013d3d68d2b86e02f

commit 33bfa990d1502aae8503e7acec2d8a00e7ce02b0
Merge: 29e9e0f 7b3c541
Author: Giulio Cervera <giulio.cervera@cyanogenmod.org>
Date:   Sat Feb 16 03:50:05 2013 -0800

    Merge "fmradio: cleanup QCOM_HARDWARE/STE_FM defs and ifdef" into cm-10.1

commit 29e9e0f427109a812c31d29e8bc6787a4b25819c
Merge: 1c8f8ce 0b8a83c
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Feb 14 19:43:05 2013 -0800

    Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_system_core into mr1.1-staging

commit 7b3c541b486cfcdfed54d8555a03b319c4c27027
Author: Giulio Cervera <giulio.cervera@cyanogenmod.org>
Date:   Thu Feb 14 12:22:00 2013 +0100

    fmradio: cleanup QCOM_HARDWARE/STE_FM defs and ifdef

    Change-Id: I00b5e6536511b3bedee6105bf010ee2b5f2e36ac

commit 0b8a83c2e5b112a9b75e6ceb0013bd9769c32dac
Merge: 8d77557 4f247d7
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Feb 12 22:45:44 2013 -0800

    Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/system/core into 1.1

    Android 4.2.2 release 1

commit fea3ce6660d78daa7e837467d084297e4088e77f
Merge: 1926308 1c8f8ce
Author: nocoast <voteforpedro8@gmail.com>
Date:   Tue Feb 12 14:40:24 2013 -0800

    Merge pull request #7 from CyanogenMod/cm-10.1

    Fix audio recording for ICS audio blobs

commit 1926308d3f083f4719723d675a9abfedece941a2
Merge: 88b98f1 9d38f0f
Author: nocoast <voteforpedro8@gmail.com>
Date:   Tue Feb 12 13:39:40 2013 -0600

    Merge github.com:CarbonDev/android_system_core into jb2

commit 88b98f12828f6f710757361485dddc84a335c063
Merge: acd412a 4f247d7
Author: nocoast <voteforpedro8@gmail.com>
Date:   Tue Feb 12 13:39:07 2013 -0600

    Merge remote-tracking branch 'google/jb-mr1.1-release' into jb2

commit 1c8f8ce4633d49c5ed76495347cb7bb80642ac20
Author: Thomas Wendt <thoemy@gmx.net>
Date:   Tue Feb 12 19:18:50 2013 +0100

    Fix audio recording for ICS audio blobs

    This fixes audio recording when ICS_AUDIO_BLOB is set because
    AUDIO_DEVICE_BIT_IN was not used with ICS. Add #ifdefs to use the old checks
    again.

    Change-Id: I33b37e74d33fed7ab0bc2af9907e07d799b0ec0e

commit 9d38f0f3156649b9303f0707ad0f7b632ad20c2e
Merge: acd412a 4d83011
Author: nocoast <voteforpedro8@gmail.com>
Date:   Tue Feb 12 09:10:01 2013 -0800

    Merge pull request #5 from CyanogenMod/cm-10.1

    Cm 10.1

commit 4d83011771ec618ff53e60b8075c51769b0d397d
Merge: 8d77557 d559a35
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.org>
Date:   Tue Feb 12 05:13:30 2013 -0800

    Merge "charger: do not suspend when handling home" into cm-10.1

commit acd412aa0ead19a5b34c5523b3d6a401acbddb73
Merge: f97ef3d 8d77557
Author: nocoast <voteforpedro8@gmail.com>
Date:   Mon Feb 11 13:31:56 2013 -0800

    Merge pull request #4 from CyanogenMod/cm-10.1

    rootdir: set perms on ondemand governor's up_threshold

commit 8d7755777425bb3154c37e8d2c2c3b45cc254b30
Author: jt1134 <jt1134@gmail.com>
Date:   Fri Feb 8 21:32:36 2013 -0600

    rootdir: set perms on ondemand governor's up_threshold

    Change-Id: I0a042a81be677821fa4099a3e19281d390dd27c3

commit f97ef3daf67fd85e25edbdb8bae67df166ac126b
Merge: 9f2fe74 fd4d11e
Author: nocoast <voteforpedro8@gmail.com>
Date:   Fri Feb 8 10:46:52 2013 -0800

    Merge pull request #3 from CyanogenMod/cm-10.1

    rootdir: Set perms on interactive governor's min_sample_time

commit fd4d11e335633067683344de0395221d0f48cb99
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Feb 7 21:16:58 2013 -0800

    rootdir: Set perms on interactive governor's min_sample_time

    Change-Id: I75e9f424af731bdf1ca222eee2f4f18b20a6552b

commit d559a355bfb5a21effbd2caeaaa1dc87047d82b2
Author: Pawit Pornkitprasan <p.pawit@gmail.com>
Date:   Sun Feb 3 22:21:32 2013 +0700

    charger: do not suspend when handling home

    When using Google's suspend implementation, home press should also wake
    the device from suspend

    Change-Id: I51f3e45c5cb418b0b3718e7223a1336876379043

commit 9f2fe74cff69fc32d0ff8036b4cd8a029d700a9b
Merge: b260435 c925999
Author: nocoast <voteforpedro8@gmail.com>
Date:   Sat Feb 2 12:23:32 2013 -0800

    Merge pull request #2 from CyanogenMod/cm-10.1

    r2

commit c925999aae343eb38e14632c0d74dd959ca5564c
Merge: 4900c5c 7d5f33e
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sat Feb 2 19:23:38 2013 +0000

    Merge commit 'android-4.2.1_r1.2' into cm-10.1

commit b260435b90945e1c5a1dd81a12413aee630a75cf
Merge: 94910ff 4900c5c
Author: nocoast <voteforpedro8@gmail.com>
Date:   Fri Feb 1 09:24:50 2013 -0800

    Merge pull request #1 from CyanogenMod/cm-10.1

    Cm 10.1

commit 94910ff90b80cf9eacf202d0137f92bba620b9b4
Author: Tylar Overturf <toverturf@gmail.com>
Date:   Wed Jan 30 18:43:51 2013 -0700

    Change to carbon.

commit 4900c5c9c9263b52d523ad0722338c8dda2055de
Merge: e15eeba 36c0ce8
Author: Jef Oliver <jef@eljef.me>
Date:   Wed Jan 30 00:14:52 2013 -0800

    Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1

commit e15eebac61d22edbe8d4aee1e794176acc4cf526
Author: dhacker29 <davidhackerdvm@gmail.com>
Date:   Thu Dec 6 22:16:01 2012 -0600

    Init: Allow building of init that is compatible with second init boot

    When using second init init has already set up /dev /proc, etc
    this will prevent duplicate mount points for those
    Define BOARD_USE_NO_DEVFS_SETUP := true to use

    Change-Id: I5620664b32e08f39da7ef7c7f9c3824d01f930d6
    Signed-off-by: dhacker29 <davidhackerdvm@gmail.com>

commit 040f61a8d882970bfd041d5a86371d37e18322e3
Author: Mike Kasick <mike@kasick.org>
Date:   Tue Jan 22 22:48:42 2013 -0500

    init.rc: Create /storage mountpoint so Dalvik can mark as slave in zygotes

    Mount a tmpfs as /storage in order to create a mountpoint, so that Dalvik
    can later mark /storage as slave in zygotes.

    Must mount in early-init as some devices' init.hardware.rc populate
    /storage then, which the tmpfs would overwrite if mounted later.

    Must use tmpfs as rootfs can't be bind mounted (otherwise "mount rootfs
    /storage /storage bind" would work as an alternative).

commit 7d5f33ed55b9511a64d3e73b33366718972f74af
Author: Devin Kim <dojip.kim@lge.com>
Date:   Fri Dec 7 09:25:06 2012 -0800

    charger: Do not suspend when disconnecting from charger

    The device should be power off when disconnecting from charger.
    If the device enter to suspend, the device couldn't handle the power off
    process. So the device shouldn't suspend to handle the power off at that time

    Bug: 7429504
    Change-Id: I9a0a60e53f315cd83550dc730a33bc7bd464ef67

commit 3493f18985973e35f83b34b737c8fbcb179007c3
Author: choongryeol.lee <choongryeol.lee@lge.com>
Date:   Thu Nov 15 17:03:03 2012 -0800

    charger: suspend enable in charger mode

    To reduce power consumption after charging completion, enable suspend when LCD
    is turned off.

    Bug: 7429504
    Change-Id: I34731dc392661c9051a20cea74f70d94a8aaeb42
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit aae1ce43a45f38b3b4c0fac90e208253fa02ffe6
Author: Iliyan Malchev <malchev@google.com>
Date:   Wed Dec 5 15:19:07 2012 -0800

    libsuspend: compile as a static library

    Compile libsuspend as a static library as well, currently needed by the charger
    code in some cases.

    Related-to-bug: 7429504
    Change-Id: I113017c2c855f915b77c76d8934b6e57c0bb532c
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 5366657219454434a99a5a5fb3d0dda4dad78b9f
Author: Mike Kasick <mike@kasick.org>
Date:   Tue Jan 22 22:48:42 2013 -0500

    init.rc: Create /storage mountpoint so Dalvik can mark as slave in zygotes

    Mount a tmpfs as /storage in order to create a mountpoint, so that Dalvik
    can later mark /storage as slave in zygotes.

    Must mount in early-init as some devices' init.hardware.rc populate
    /storage then, which the tmpfs would overwrite if mounted later.

    Must use tmpfs as rootfs can't be bind mounted (otherwise "mount rootfs
    /storage /storage bind" would work as an alternative).

commit f98b13511cf9fef3f59b2525407288d044c463e3
Merge: 2c4f676 674a79d
Author: nocoast <voteforpedro8@gmail.com>
Date:   Mon Jan 21 09:51:06 2013 -0800

    Merge pull request #1 from CyanogenMod/cm-10.1

    Removing unecessary eng tag

commit 36c0ce89112eb44a0e003f23daeb9bedbe402ad0
Author: Naveen Agarwal <naveen.agarwal@stericsson.com>
Date:   Fri Jul 6 17:38:57 2012 +0530

    FM Radio: Add support for FM Radio in Android

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

    Change-Id: I1a71aed01bfffdddfabf1cdfbfa3707cb1ed016b
    Signed-off-by: Benn Porscke <benn.porscke@stericsson.com>

    Conflicts:
    	include/system/audio.h

commit 674a79d65011020c7a366b8fa9924f3bce72f72c
Merge: aea2556 7cc5037
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Jan 21 08:45:31 2013 -0800

    Merge "Revert "init.rc: Create /storage mountpoint so Dalvik can mark as slave in zygotes"" into cm-10.1

commit 7cc503720f1a8a6aa9481c5f9fd4552bc463a501
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Jan 21 08:45:21 2013 -0800

    Revert "init.rc: Create /storage mountpoint so Dalvik can mark as slave in zygotes"

    This reverts commit 36454361efaa4d30a6c8c2cca49121e35ef74f7e, since the tmpfs is clobbering mountpoints created by init.hardware.rc. Most (all?) devices with non-emulated SDs are currently b0rked.

    Change-Id: Ib34660e2d45473775757e94800fc4ec57f6c8d77

commit aea2556dd6e175a162a3021972ef00ef4c5305bf
Merge: 3645436 420437d
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Jan 20 20:29:48 2013 -0800

    Merge "unpackbootimg: remove host LOCAL_MODULE_TAG" into cm-10.1

commit 2c4f67654f6a1824c7a4621b945d88565ee5a7f5
Author: Liquid <rjbirnesser@gmail.com>
Date:   Fri Jan 18 23:24:36 2013 -0500

    Load Liquid Init RC Upon Boot

commit 420437da912003da888ec83c2e897966f1e86732
Author: Andrew Sutherland <dr3wsuth3rland@gmail.com>
Date:   Sun Nov 25 18:31:20 2012 -0600

    unpackbootimg: remove host LOCAL_MODULE_TAG

    Change-Id: I199d680dc5ab8bf50f5be65c29095bf3adade695

commit 36454361efaa4d30a6c8c2cca49121e35ef74f7e
Author: Mike Kasick <mike@kasick.org>
Date:   Thu Jan 10 17:45:33 2013 -0500

    init.rc: Create /storage mountpoint so Dalvik can mark as slave in zygotes

    Mount a tmpfs as /storage in order to create a mountpoint, so that Dalvik
    can later mark /storage as slave in zygotes.  Must use tmpfs as rootfs
    can't be bind mounted (otherwise "mount rootfs /storage /storage bind"
    would work as an alternative).

commit a144fc500d2c428f4d1375516c35d0825a35fae0
Author: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date:   Mon Aug 20 00:08:12 2012 +0200

    sync_test: Use -fno-strict-aliasing

    Use -fno-strict-aliasing here so we don't have to use it globally.
    Performance on tests isn't important anyway.

    Change-Id: I92ae7209ced60176cc5608f32b8ff6a911c09f10
    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

commit 4e92ea512a25012806ed1dbf6315765bdf896979
Author: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date:   Tue May 8 18:54:18 2012 +0200

    core: Fix build in ISO C++11 mode

    Fix compatibility with ISO C++11 compilers

    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
    Change-Id: I8f9aa775b5681d4d8c5202a1a1935acb4efa4171

commit db07167e72bcf3bfcc5ed9f68817268cb70d537e
Author: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date:   Mon May 21 21:11:20 2012 +0200

    adb: Don't force -O2

    Don't force -O2 over -O3 -- the O2 hardcode is there to force
    optimizations, not to reduce them...

    Change-Id: Ic75eeb767db4926f519580fba8f5f7b8e593df4f
    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

commit 171456b69e744e9e201a51947227fc63001562c4
Author: Prashant Somashekar <prashsomash@gmail.com>
Date:   Mon Dec 24 03:03:15 2012 -0500

    audio: fix build break for non QCOM

    Output:
    error: 'AUDIO_DEVICE_IN_ANC_HEADSET' was not declared in this scope
    error: 'AUDIO_DEVICE_IN_FM_RX' was not declared in this scope
    error: 'AUDIO_DEVICE_IN_FM_RX_A2DP' was not declared in this scope
    error: 'AUDIO_DEVICE_IN_PROXY' was not declared in this scope

    Change-Id: Ie18c623303b944544b68eecca6208607d54b1c9a

commit 8413e2b1e19a8cc406d9bc4f8e65716d46587c36
Author: Mingming Yin <mingming@codeaurora.org>
Date:   Wed Nov 28 15:33:09 2012 -0800

    audio: add QCOM supported audio devices

    - Add ANC headset, FM, and proxy devices

    Change-Id: Ib7b7495ed69ca3ab072c5512e9286da8d3538682
    (cherry picked from commit fd629294bcaaa2cb70befc631f7596439d6cbe70)

    audio: add support for QCOM audio formats

    - Add support for EVRC, QCELP, and WMA formats

    Change-Id: Id5f7845ff7bc609e947f93d8647ad3f3e57babfb
    (cherry picked from commit 8b3476f14882afa74e9c3b778d9ccbd97ee329f0)

    audio: add QCOM supported audio channels

    Change-Id: Id29cb6949e137be8fb71d8d45e8e12bc47795f40
    (cherry picked from commit 2fe37a40228c97e6f3b0575d94d4ec50b4dde1d6)

    system/core: Add Qcom specific audio flags

    - Support for Tunnel Mode Playback
    - Reserve the LPA and VOIP_RX flags

    Change-Id: Ifcbeb2a28feb86b030f48010a8a4e9cda8629e5b

    Add ifdefs for QCOM enhanced features

    Change-Id: Idefa831ecb4fdb881c990ba02ab4ab0ab7871986

commit 9b1ad4ad4b698c6ed929e75133d98b1fe19fc021
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sun Dec 23 01:17:07 2012 +0000

    audio: Fix input enums for pre-4.2 audio blobs

    Change-Id: Iec9f8d915d069168664d2cd873574db7fe5cddc7

commit 16753a4be3e1ebaecdcd215b27df21b023403d5e
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Dec 11 17:53:36 2012 +0700

    Set ANDROID_PROPERTY_WORKSPACE in exec.

    Change-Id: Ib827bf14b4463ca6277b79256bcc4cd70f63fc31

commit da448f6a241b837b1b82f58483ae7f6947d93a32
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sun Dec 9 20:05:02 2012 +0000

    libnetutils: Fix up the dhcp request arguments

    The interface/config-file arguments passed to the dhcpcd invocation
    when a hostname isn't provided were swapped, causing requests to be made
    for interface <config-file-name> instead of <interface-name>, and
    failing all calls to start dhcpcd through netutils with the following error:

    E/DhcpStateMachine( 3214): DHCP failed on wlan0: Timed out waiting for dhcpcd to start

    because...

    <3>[  582.717015] init: no such service 'dhcpcd_/system/etc/dhcpcd/dhcpcd.conf:-f wlan0 wlan0'

    Change-Id: Ic2e026ae8ebebdc9a27f5d7a6274e1c5c8a2f95e

commit 57bf34d85b43766a76a241b0f970e320b4c31cf5
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Dec 7 15:44:58 2012 -0800

    camera: Add new commands to compatibility block

    Change-Id: I2952963661abf17f55eca811a8d4e8fc87933df0

commit d7fbac3c4a5cec9b0249e2871391513dcc45db3f
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Dec 7 00:35:40 2012 -0800

    camera: Remove histogram commands

    Change-Id: Ice4012922936ee1d0f9005797f72f9f2b38b951c

commit f6c28026d99cebbede1e60b9ffb41ff6f65a160a
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Dec 7 11:40:11 2012 -0800

    Revert "init: Never allow two same-service processes to exist simultaneously."

    This reverts commit abe57d0b4e994e31eb31ec98dfa6d4b74e29502e.

    Revert "Restart oneshot services when manually restarted."

    This reverts commit e889a4746b6f3cd1c6749312c255b14eedc5f778.

    Revert "Safely restart services to avoid race conditions."

    This reverts commit 9d1a567eb0d6ac8d0040228e7c41668c8e3eb37e.

commit c3b3837623549170e321645b6d8ab3bb49d44d0d
Author: Emerson Pinter <dev@pinter.com.br>
Date:   Mon Nov 26 21:48:12 2012 -0200

    liblog: add required function

    Some Motorola proprietaries require a function named __android_log_loggable. This
    change adds the function and solves problems with radio and other
    binaries on qualcomm based Motorola phones. This code is activated with
    TARGET_USES_MOTOROLA_LOG:=true

    Change-Id: I722b42d34198c027f265c3cf9f220d9798814915

commit 10766dbb8962b70f2ffb8ff5392f55b177d99ad7
Author: Michal Frynas <michal.frynas@sonyericsson.com>
Date:   Thu Jul 14 15:20:05 2011 +0200

    Fixed improper size displaying in 'df' utility

    'df' command used to display filesystem usage statistics as integer
    values, in most cases rounding the actual value down. Because of
    that 'df' tended to display faulty size values.
    This fix to 'df' utility calculates the fractional part of the size,
    then it rounds it when needed to the nearest one-digit integer value
    and displays after decimal dot.

    Change-Id: I9bc52635d45d3e55ce61b3b1c6b80d1267516e75
    Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>

commit 9655a86324e2279c8a1399e7a29f05c3bc99d2ea
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Dec 2 07:34:02 2012 -0800

    rootdir: Add mediaserver to qcom_diag group

     * QCOM audio drivers need this.

    Change-Id: I3cba0356e2995951208fee5e180e56b1afbc7158

commit ec1f2815e968bbdaebfd54b62c5b037cc6621d80
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Dec 1 08:24:52 2012 -0800

    libion: Support for old ION API

     * Kernel 3.0 doesn't have heap_mask or SYNC ioctl, so add a board flag
       so that proprietary code that uses the old kernel API directly still
       works.

    Change-Id: I4227c79a5de46c60eeebd2e16ca88dd6d580916a

commit 91137e19bf815da18f4c0250bcb1c97bb00ef7c7
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sat Dec 1 18:38:53 2012 +0000

    init: Bring back support for arbitrary chargermode cmdlines

    This was accidentally removed while debugging the init breakage
    fixed in change I8ef5c932efcd5e7f8d6f6fce0915683d84c3ee11. Put
    it back

    Change-Id: If35b9d5db281f8aab6de26f2bb63717d28b2db30

commit a39679fbd9fd51c033461a4ca25324dd181af7a6
Author: Chirayu Desai <cdesai@cyanogenmod.org>
Date:   Sun Nov 25 16:14:19 2012 +0530

    toolbox: new applet restart

    - stop + start
    - for the lazy.

    Change-Id: Ie0ef0e27f5b7819a5575ece6b82c5813f4e38420

commit 44cc2f96f1bb63e2c8242ee033a55737ca7bec3b
Author: Koushik Dutta <koushd@gmail.com>
Date:   Sat Nov 24 16:14:32 2012 -0800

    ramdiskaddr is now ramdisk_offset

    Change-Id: I3bf83af5f7001f581506dc7fd9b1eb653334ad35

commit 4a82b342676c70dc57e1202a5526fe00ebf467f2
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Fri Nov 23 17:12:30 2012 +0000

    init.rc: Move CM's sysinit to the init.cm file

    Its current location is broken due to a race condition, anyway...

    Change-Id: Ic371455521d10fc09c81331c4c4faeab5cfb89d1

commit e682ec29e66085cb77796969e4f633fa6cca6b26
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Nov 19 21:55:32 2012 +0000

    Fix /cache permissions for the dexopt cache

    Change-Id: Ibbecac2b5a89d7fa7fb09c5be1d2bc3db766f885

commit f299ff586e2d02be88285d97a58a17e9a44be9c2
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Nov 19 18:04:21 2012 +0000

    Deprecate distinct boot paths for androidboot.emmc

    Qualcomm used to require a "on emmc-fs" to distinguish multi-boot
    devices, in replacement of the usual "on fs". This distinction has
    been deprecated in jb, and it's breaking mako

    Change-Id: I8ef5c932efcd5e7f8d6f6fce0915683d84c3ee11

commit 5056eab7c686fb3bfb67b81225adfc1938ceb0b1
Author: David Ng <dave@codeaurora.org>
Date:   Thu Aug 23 20:40:33 2012 -0700

    init: Add support for properties expansion in exec command

    Add Android properties expansion to 'exec' arguments.
    E.g.  exec /system/bin/log ${sys.usb.config}

    CRs-Fixed: 390942
    Change-Id: Ie520396d951e578bd9f591734a45d2f460b8f51d

commit d23a32d1ae32fb4e421f93757fdb65441f6aa91a
Author: Shashank Mittal <mittals@codeaurora.org>
Date:   Wed Jul 25 13:12:21 2012 -0700

    Add support for exec command in init scripts.

    Change-Id: Iee523fd75410718f0bd090f5fdcba50825a698c4

commit 7fe79165fe05dfb464a9e0753dc21470e7a1eebd
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Nov 19 17:31:50 2012 +0000

    Revert "init: Implement exec support"

    This reverts commit 2f0ed0d3ced82e53b1fc1f994c6bd3e97683264c.

    Change-Id: Ia0754c913da3d20c4e0c207ca479c043d394944e

commit 299c6048c5643bcc1e4ac2f8cf9b569b85c333b0
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Nov 19 17:31:24 2012 +0000

    Revert "init: Add support for properties expansion in exec command"

    This reverts commit 590e70506cab66bd6b41adfd15ef09bb42df2953.

commit cd7c576df0771121ca4438c1d733c263a09857f1
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Nov 19 16:41:26 2012 +0000

    adb: Fix missing header paths

    Change-Id: I570b631ced11ab104aafe7ebfe71bae4e380d8af

commit 7fe624e655044ed8f9d9cdb4322cf765e40a7910
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Nov 19 16:28:39 2012 +0000

    Revert "init: Check for symlinks with lstat() not open()"

    This reverts commit f3e86113ceae0e58735ca99754d77b1b9d1a83b5.

commit 5827cc4bd7b381f2734d0b958f96f4cf81090f42
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Nov 19 12:54:24 2012 +0000

    Revert "libcutils: Fix aliasing violations"

    This reverts commit 826d75fb6dcefe8a6c6d4d54a7d215553945812a.
    Breaking build with 4.2

    bionic/libc/include/string.h:105:33: error: call to '__memcpy_dest_size_error' declared with attribute error: memcpy called with size bigger than destination
    bionic/libc/include/string.h:109:32: error: call to '__memcpy_src_size_error' declared with attribute error: memcpy called with size bigger than source

    Change-Id: I777e5f5cd87fb972c833ef6bd81b23cd29878e9b

commit 39d33d8d54ba55e49f9b430f842647a84751cb85
Merge: d8aa8ab 31da9db
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Nov 18 19:19:50 2012 -0800

    Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/core into mr1

    Conflicts:
    	adb/Android.mk
    	adb/usb_vendors.c
    	include/private/android_filesystem_config.h
    	include/system/audio.h
    	include/system/camera.h
    	init/property_service.c
    	libnetutils/ifc_utils.c
    	mkbootimg/mkbootimg.c
    	rootdir/init.rc

    Change-Id: Ie42f0c14808e9f8cabd24854bfe15b6667955229

commit d8aa8ab7424be375e4408ab360c000ac8b05d15d
Merge: feb666d 1323e37
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Nov 6 00:29:27 2012 -0800

    Merge "charger: allow home button to wake" into jellybean

commit feb666d4830074c3a78d820e98a3781ecf351e0c
Author: Giulio Cervera <giulio.cervera@gmail.com>
Date:   Thu Oct 11 14:56:01 2012 +0200

    Update tcp buffersize settings

    Soem of these values are from CAF, some of these are
    from various shipping devices, some are educated
    guesses based on the properties of each connection.

    In general, the higher the bandwidth-delay product
    of a network, the larger the buffer needs to be.

    Change-Id: Idd8cd27727b5e66bd3a46be5f9853380acbda8ba

commit 1323e370150551207491ee1e9589e6e2df6fd120
Author: Pawit Pornkitprasan <p.pawit@gmail.com>
Date:   Sat Jul 21 22:09:37 2012 +0700

    charger: allow home button to wake

    On certain devices (e.g. galaxysmtd), the user expects the physical
    home button to be able to wake the device as well as the power button.

    Change-Id: If764f36aba3810dfa5233af8baf0a740b04889e0

commit 1e6a58b64edca49a54c3909f47c7e318e12dc476
Author: dhacker29 <davidhackerdvm@gmail.com>
Date:   Fri Nov 2 11:43:02 2012 -0500

    Allow a device to define the max number of service groups in init.h

    Certain proprieatary binaries (such as tcmd for instance) require
    more than 12 supplementary service groups.  By definiing:
    TARGET_NR_SVC_SUPP_GIDS := in BoardConfig this can now be changed
    per device.

    Change-Id: I8f968adc21768ca90232ded7b7e1ffa68dc7ea78
    Signed-off-by: dhacker29 <davidhackerdvm@gmail.com>

commit d2c2b10b54a21aa4eb961fb46e9c0bfcea2c6a85
Author: Mike Kasick <mike@kasick.org>
Date:   Thu Oct 25 22:08:55 2012 -0400

    init: Allow device-specific appends to the property service permission structs

    Extends device_perms.h API to allow property_perms and control_perms to be
    appended on a device-specific basis, without needing to redefine the entire
    struct contents.

commit 40b7fa29676d506e1adc711847798d3a9f8811e2
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sun Sep 23 01:14:51 2012 +0100

    libion: Disable for omap3

    the omap3 HAL repository has its own modified libion, which is
    necessary for the openmax libraries

    Change-Id: Ic6f175fe456a2891d5556d937c3073215b861981

commit 152977d6368ed4884252fe2bf818e12827544a30
Author: Giulio Cervera <giulio.cervera@gmail.com>
Date:   Sat Oct 20 19:11:53 2012 +0200

    Provide permission for graphics to set service.bootanim.exit prop

    Change-Id: If23d14172022907fcefdcf7430904eb560d4d64c

commit 943dba184eb5c0f46dc70a5db140c5b5ceb4b7a0
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Thu Oct 18 16:31:17 2012 +0100

    init.rc: Fix compcache and cleanup init file

    The "import" keyword is only parsed once, for a one shot execution, during
    the initial section setup, and before running "on fs". Having an import of
    a file that's located in a filesystem other than root will result in an error
    like

    <3> init: could not import file '/system/etc/init.local.rc' from '/init.rc'

    So... any files imported into init need to be moved to the root fs.
    While we're at it, move init.rc changes that are specific to CM (and don't
    involve modification of preexisting configs) into this file, to ease future
    upstream merges.

    Change-Id: I0f70ffad874648198acde67c12e1a7833552ad7c

commit f7d3ae2e94644df77c7738b275a9a6dda03d3343
Author: yyjdelete <yyjdelete@gmail.com>
Date:   Thu Oct 11 16:47:26 2012 +0800

    adbd:fix framebuffer handle when(fbinfo.size % 640 != 0)

commit 41d1bc040830b20a845d69f26982d876b3448768
Merge: dd91699 e1d9986
Author: Daniel Hillenbrand <codeworkx@cyanogenmod.com>
Date:   Wed Oct 10 07:15:31 2012 -0700

    Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" into jellybean

commit dd91699f94c67d5a552b22f324d9c79416838809
Merge: f7ac9ae ca38f2c
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Oct 9 13:14:41 2012 -0700

    Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/system/core into aosp-merge

    Conflicts:
    	rootdir/init.rc

    Change-Id: I438743e976c6709088458f1a8dbec4fb974dd8fa

commit e1d9986814a12c00764b987e71d83f426bd280aa
Author: James Sullins <jcsullins@gmail.com>
Date:   Sun Jun 24 07:07:42 2012 -0500

    toolbox/dmesg: do not hardcode KLOG_BUF_LEN

    Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188

commit f7ac9ae1c0dfccdbc441a5c64ae843bc3c56ff1d
Author: Richard Ross <toastcfh@gmail.com>
Date:   Thu Oct 4 16:00:23 2012 -0700

    Add HTC Logging functions to support newer HTC props.

    ifdef'd with HTCLOG.

    Patchset2: remove unused function.

    Patchset3: add indents to returns.

    Change-Id: I70d0a6878dddf0f41d96735febda82c93496d8ec

commit 22d8f165e9e37b085d4cbe0b92e387fd53759406
Merge: 38eee0f 7c9bc37
Author: Giulio Cervera <giulio.cervera@gmail.com>
Date:   Fri Sep 28 13:59:46 2012 -0700

    Merge "core: Add API to retrieve mtu size" into jellybean

commit 38eee0ffd186a3d42ac65b934289e46150496861
Author: David Ferguson <ferguson.david@gmail.com>
Date:   Wed Sep 26 06:36:14 2012 -0400

    charger: make default to not suspend in charge mode

      * http://r.cyanogenmod.com/#/c/19760 made the device suspend in
        charge mode when the animation was not displayed. Previously
        the device never suspended.
      * The above change broke charging mode on some (maybe many?) devices
        that do not properly handle suspending in charge mode.
      * This change brings back the more compatible default behavior of
        not suspending in charge mode and introduces a new BoardConfig.mk
        variable called BOARD_ALLOW_SUSPEND_IN_CHARGER that, when set to
        true, will suspend in charge mode.
      * This allows devices that support suspend in charger to opt-in
        instead of having to opt-out previously working devices.

    Change-Id: I5a480e34ba5946a52e371ac79a965ecee5471c5a

commit cc3f9d1727929ddfa2775ec07b4379bddc543571
Merge: c9d9080 0e7ce5d
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Sep 24 17:54:53 2012 -0400

    Merge "Add RAW burst message" into jellybean

commit c9d9080ff9b9c4ae6c4805a015aa1c840609461c
Merge: 46495f9 1faaf38
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Sep 24 17:54:39 2012 -0400

    Merge "Camera: Adds burst camera message type" into jellybean

commit 0e7ce5da500b32b9f8ef046822c90f99019d50f0
Author: Tyler Luu <tluu@ti.com>
Date:   Thu Feb 2 11:14:28 2012 +0200

    Add RAW burst message

    Change-Id: I5b42c66485151d1ba9eea8fbe58d334c2a892c24
    Signed-off-by: Tyler Luu <tluu@ti.com>
    Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>
    Signed-off-by: Daniel Levin <dendy@ti.com>

commit 1faaf385963053520edd36d4ea7b50fe5caf51af
Author: x0118064 <saravanan.s@ti.com>
Date:   Mon Sep 26 15:49:53 2011 -0500

    Camera: Adds burst camera message type

    Change-Id: I5ae041ae6062367abd8f8f59879846ae4ef3f72b
    Signed-off-by: Solaiyappan Saravanan <saravanan.s@ti.com>
    Signed-off-by: Emilian Peev <epeev@mm-sol.com>
    Signed-off-by: Vicky Martinez-DeFrain <a0869710@ti.com>
    Signed-off-by: Daniel Levin <dendy@ti.com>

commit 46495f997bfe04621eac98f78b1b9f604e811423
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Sep 24 12:10:32 2012 -0700

    rootdir: Tighten permissions on boostpulse nodes

     * New PowerHAL code will only write to this as the system user, so
       remove the need for it to be world writable.

    Change-Id: Ia9e69a6feff7c5ef1ff34a1180225e4008e8130f

commit a17cf4c0b406769f20aa6a541c4649ceb7059124
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Sep 24 19:32:23 2012 +0100

    Revert "Upgrade to dlmalloc 2.8.5."

    These changes to malloc were breaking some blobs...

    This reverts commit 5d382954131d2ed5e98438fd22e87506e9441901.

    Change-Id: Idbb88c5f18e89c76251dd0a5038ec75e22c197b2

commit 7c9bc378e45b8dcac8bb3ba60748adbdbb4d15a9
Author: Niranjan Pendharkar <npendhar@codeaurora.org>
Date:   Wed Nov 16 12:50:36 2011 -0800

    core: Add API to retrieve mtu size

    Adding an API to libnetutils to retrieve mtu size of an interface
    Made few utility functions from ifc_utils public

    Change-Id: Iddec2dcd9f241b146d7f362e2df0724cf740d1f2
    (cherry picked from commit 108cded7d96cc347f36b5b78c404c5ebccce13d7)

commit d39f52491364217e40aca4fb06ed9f7903af60f0
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Sep 20 20:14:11 2012 -0700

    init: Set the "ro.boot.emmc" property

     * QC switched to this from the old "ro.emmc" property.
     * Set both values since many things depend on this.

    Change-Id: I958dbb13b08bd576ad16318683a0eac45dfc6fee

commit c181583376046a914e2638b0fc0a991d9c8613d7
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Sep 20 17:08:37 2012 -0700

    rootdir: Add terminfo path

    Change-Id: Ic879b77d1c34ebedf0f790648d286441d6b2bed1

commit 5d382954131d2ed5e98438fd22e87506e9441901
Author: Ian Rogers <irogers@google.com>
Date:   Fri Aug 17 17:08:48 2012 -0700

    Upgrade to dlmalloc 2.8.5.

    Remove mspace functionality from cutils.
    Directly declare mspace from dlmalloc in code flinger's code cache, and
    manage without using morecore.

    Depends upon: https://android-review.googlesource.com/41717

    Change-Id: If927254febd4414212c690f16509ef2ee1b44b44

commit 2a3f900db252ce7b9459d41be3b6b7c8260df299
Merge: 8886cb5 6e9038b
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Sep 14 01:42:23 2012 -0400

    Merge "system/core: Add command NATIVE_WINDOW_UPDATE_BUFFERS_GEOMETRY" into jellybean

commit 8886cb53ba691e2529def0a2ddf138d8b3680bcf
Merge: ae3a615 087b530
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Sep 14 01:28:03 2012 -0400

    Merge "charger: suspend when not animating" into jellybean

commit 6e9038b0c5fce1ca990152980ec003df345980a0
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Thu Aug 9 00:58:43 2012 -0700

    system/core: Add command NATIVE_WINDOW_UPDATE_BUFFERS_GEOMETRY

    Add native window command to update buffer buffer width, height
    and format before queuing the buffer.

    Change-Id: Ic133f89afb762cfce5084af820af5f9bad2a4a0b

commit ae3a615ab7b9be8224e3b953c17b87f9c9db693c
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Sep 11 20:10:38 2012 -0700

    rootdir: Update cpufreq permissions when governor changes

     * Requires a kernel change to send the uevent.
     * This should alleviate some frustration that the performance/kernel
       folks have expressed regarding the Power HAL.

    Change-Id: I31e6e13534159214a3b600082b7c0e4249433364

commit 673adb213b48599ab07e59b8a1a5cec474fb7cf7
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Sep 11 11:23:49 2012 -0700

    Revert "libpixelflinger: Build NEON optimized routine per target configuration"

    This reverts commit bdfea1e7a961370679c7b4cf0d652bab54653389.

commit 3d2c63dd11a26be3804b5abffd4b6defd623fcec
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Sep 11 11:23:38 2012 -0700

    Revert "libpixelflinger: Add ARM NEON optimized scanline_t32cb16"

    This reverts commit 8ec8b960b01dc1aab2be67f50b608b1a23f33959.

commit 590e70506cab66bd6b41adfd15ef09bb42df2953
Author: David Ng <dave@codeaurora.org>
Date:   Thu Aug 23 20:40:33 2012 -0700

    init: Add support for properties expansion in exec command

    Add Android properties expansion to 'exec' arguments.
    E.g.  exec /system/bin/log ${sys.usb.config}

    CRs-Fixed: 390942
    Change-Id: Ie520396d951e578bd9f591734a45d2f460b8f51d

commit be5bb1d4aa98e066c44e5ee8a54a9bf92b17aa37
Author: David Ng <dave@codeaurora.org>
Date:   Wed Jan 4 12:15:11 2012 -0800

    init: Add "export_rc" command to export env from a specified file

    New export_rc command to import environment variables from
    a specified file at the time the command is executed.

    Differences between "import" and "export_rc":
    1) export_rc can only import environment vars
    2) export_rc is performed when the command
       is executed rather than at the time the
       command is parsed (i.e. "import")

    Example:
    in /init.rc:
        on post-fs
            export_rc /system/etc/init.xyz.rc

    in /system/etc/init.xyz.rc:
        export LD_PRELOAD /system/lib/libxyz.so

    Change-Id: If616dea5b508c27e9f7a95b5e9db696ecea2fdee

commit 39948802fac7b6344c4dd5723fc7be2fcc4225ec
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Sep 6 01:19:55 2012 -0700

    Revert "window: Add API to set the min undequeued buffer count"

    This reverts commit ef6d451e17a2696e017b0e683079d049893fd1b7.

commit 097efdb43ba5691264820bea6c2b79f0c2ad1a30
Merge: 6479e18 50fa901
Author: Giulio Cervera <giulio.cervera@gmail.com>
Date:   Thu Sep 6 05:17:05 2012 +0400

    Merge "include/system: JB upgrade for the MPQ8064" into jellybean

commit 50fa9018ffcac83d7f1a75c42a7a1abcc7a51053
Author: Aviral Gupta <aviralg@codeaurora.org>
Date:   Mon Jul 30 00:07:46 2012 +0530

    include/system: JB upgrade for the MPQ8064

    Include the flags for the MPQ8064.

    Change-Id: Ic1bd11d341456a8b217d63cddbb19a9a92ee86c5

commit 6479e181cbdd94d2c1de6f8a96ab8c118c6230b4
Author: Naveen Kalla <nkalla@codeaurora.org>
Date:   Thu Jul 26 00:26:13 2012 -0700

    Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO

    Change-Id: I2cff0f275db63e5036bf64e25794445f5c08f7ed
    See: https://android-review.googlesource.com/#/c/39871/

commit 8ec8b960b01dc1aab2be67f50b608b1a23f33959
Author: Jim Huang <jim.huang@linaro.org>
Date:   Sat Apr 9 01:15:28 2011 +0800

    libpixelflinger: Add ARM NEON optimized scanline_t32cb16

    It can dramatically improve the performance of boot animation.

    Change-Id: Idc611c15ec9270eb638412d72021880d813e3d9c
    See: https://android-review.googlesource.com/#/c/16358/

commit bdfea1e7a961370679c7b4cf0d652bab54653389
Author: Jim Huang <jim.huang@linaro.org>
Date:   Fri Apr 8 03:45:08 2011 +0800

    libpixelflinger: Build NEON optimized routine per target configuration

    The variable TARGET_ARCH_VERSION variable has been renamed to
    TARGET_ARCH_VARIANT, and armv7-a-neon is the exact target enables
    ARM NEON instructions.

    Change-Id: I999e3b0b8f3a03ff31346f83eb66ac52edc8d551
    See: https://android-review.googlesource.com/#/c/22208/

commit cb6fc0ec75d1ffedf815e17b1c1b1e240931aa06
Merge: ef6d451 fbef26c
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Aug 27 07:43:51 2012 +0400

    Merge "Permissions for I/O scheduler settings" into jellybean

commit ef6d451e17a2696e017b0e683079d049893fd1b7
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Aug 26 13:07:16 2012 -0700

    window: Add API to set the min undequeued buffer count

     * Raising this value globally has some effects on other parts of the
       system. We need to control it dynamically.

    Change-Id: Ie11c7a7e53006aad710aebce64c02d3a3f64ade1

commit fbef26cde824adb543427bec9315b6e1aa34ce27
Author: Marcel Bokhorst <marcel@bokhorst.biz>
Date:   Sat Aug 25 21:37:20 2012 +0200

    Permissions for I/O scheduler settings

    Belongs to:  http://review.cyanogenmod.com/22127

    Change-Id: Ic641a368b445afd2959eb98b7ae4b18f3adfbaea

commit 92c3874861402821ac5d2ce94ef9e5c7310b05ca
Author: Sidipotu Ashok <sashok@codeaurora.org>
Date:   Fri Aug 3 10:47:13 2012 +0530

    audio: Add a flag for VOIP RX

    Change-Id: Iecb8c3a7b247c0a839b4b145574e2c4f35dbce64

commit bbfd31973bf9abc15099b3ba8b20b9ddba17cc4b
Merge: 6934c8f e845306
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Aug 22 09:34:30 2012 +0400

    Merge "Add support for wifi display" into jellybean

commit 6934c8ff849141d36790c663992bfbce5d7202cd
Author: Dixon Peterson <dixonp@codeaurora.org>
Date:   Fri Jun 29 17:19:17 2012 -0700

    diag: Remove world read/write permissions from /dev/diag

    /dev/diag has world read/write permissions which is considered
    a security risk.  Remove these permissions.  Add new qcom_diag
    group for access to /dev/diag

    CRs-Fixed: 356415
    (cherry picked from commit 14c85ec56fd47c5eb143617a3bd5a6e7ee39cb6e)

    Change-Id: I536323a97e19a07bbd8eadffa0265d1955590285

commit e845306a0277f6aa25275e333fc04cccdd3f4b1d
Author: Mingming Yin <mingming@codeaurora.org>
Date:   Wed Jul 25 01:04:46 2012 -0700

    Add support for wifi display

    -Define AUDIO_DEVICE_OUT_PROXY and AUDIO_DEVICE_IN_PROXY

    Change-Id: Ia1835f7e968c18395f70f0763f08dd8856ce8ad3

commit a6a6bcfe8c50a4ac51f91a8468e44cdc83838c82
Merge: 3bbaa3a 7140ae2
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Aug 19 14:06:17 2012 +0400

    Merge "Fix PowerHAL cpufreq permissions" into jellybean

commit 3bbaa3a1a9617dcafbd2fc51f8419884ad81e455
Author: Vidyakumar Athota <vathota@codeaurora.org>
Date:   Fri Jul 6 18:29:42 2012 -0700

    audio: Squashed set of commits for QCOM audio features

    system/core: Add audio enums for QCELP/EVRC feature support

    - Added required enums for QCELP/EVRC features.

    Change-Id: Ib6b2297ebc9cac785fec99c3c2c80b1ad9b774f6

    system/core: Added changes required for tunnel mode recording

    - EVRC and QCELP format values are interchanged, due to
      this EVRC/QCELP are not recording with proper header.
    - Added preproc_ctl, evrc/qcelp for tunnel mode recording.

    Change-Id: I93db3170895387bec43a62214aa5d65aaab40c87

    system/core: Add output flag for LPA and Tunnel

    Change-Id: I621818502c273b2c8aba37f64a83539450a1aafa

    audio: VOIP bringup and support for vocoders.

    Setup permissions for MVS driver.

    Add vocoder types.

    Change-Id: Ie150be9b01137628ba3e3ea788d429096ba1f413

    system/core: Add enums for voice call recording.

    Add enums for voice call recording

    Change-Id: Idd5cd19573c48a0a782bcd56cca38b4901391bbf

    system/core: Add support for surround sound recording

    - Add 5.1 input channel definitions and masks

    Change-Id: I24375c0d9443cd6e8dd58114464bf9f528b97d43

commit 9464c92926f1ffb0226f11554c05949f12aedaa3
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Fri Aug 3 21:09:25 2012 -0700

    system/core: Add command NATIVE_WINDOW_SET_BUFFERS_SIZE

    Add native window command to set user defined buffer size.

    Change-Id: Ib500e65283706d860d62cb487720008d7331ce2d

commit 7140ae245c78c745182996cdba275652c9fd6012
Author: Darren Landoll <darren.landoll@gmail.com>
Date:   Fri Aug 10 20:42:30 2012 -0400

    Fix PowerHAL cpufreq permissions

    The process containing PowerHAL didn't have group permissions to open
    /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor|max_freq|min_freq.

    Modified permissions to match AOSP using the system user as the owner.

    Change-Id: Idbdad8b00b8ad7d7d2a845287cccbabb58fc5aba

commit b0d94241f063ddb51d81a2293ccd086fd601e5ff
Merge: ba77a51 51b14a6
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Tue Aug 14 13:50:08 2012 +0400

    Merge "init: Reintroduce support for the older charger modes" into jellybean

commit 51b14a69f822191de9cb569988296ab84091095a
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Tue Aug 14 10:48:04 2012 +0100

    init: Reintroduce support for the older charger modes

    For devices with pre-ICS bootloaders, bring in the support for
    arbitrary cmdline charger flags from CM7

    Change-Id: Ibf887f6aeca0b68aa38fe035aa586aed502f1662

commit ba77a51e1437ccd0c9078598ee891f4ac19f115d
Merge: 82583bf 5c7c5d9
Author: Giulio Cervera <giulio.cervera@gmail.com>
Date:   Tue Aug 14 03:17:09 2012 +0400

    Merge "system/core: To enable FM add FM stream, device and driver" into jellybean

commit 82583bfef13e4ac6fb2a373992ce451717091552
Merge: f773f05 b8d3d0e
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Aug 10 01:42:19 2012 -0700

    Merge branch 'jb-release' of https://android.googlesource.com/platform/system/core into aosp

    Conflicts:
    	rootdir/init.rc

    Change-Id: I62663d9afbce06c44d2ace254e73ee1594632967

commit 5c7c5d942cff47d640088f4cdff05b4af864e8ca
Author: Shashi Kumar <sulege@codeaurora.org>
Date:   Fri Jul 20 18:23:02 2012 +0530

    system/core: To enable FM add FM stream, device and driver

    Change-Id: I5ac8f446c1a785d435bef78bb57a28c95e377810

commit 087b5305fa20a358a6547a272f68ae08afd25efa
Author: Pawit Pornkitprasan <p.pawit@gmail.com>
Date:   Sat Jul 21 13:14:11 2012 +0700

    charger: suspend when not animating

    Suspend will save power (i.e. charge faster) by disabling unneeded
    devices such as the touch-sensitive keys on galaxysmtd.

    Change-Id: I9b2eae1af2e9687546af9dcb10ce1fcb4c1e1ed6

commit f773f0589761fba76ed4fb77345fb24efbce9828
Author: Ankit Premrajka <ankitp@codeaurora.org>
Date:   Wed Nov 16 00:09:57 2011 -0800

    camera: change camera node permissions and add certain parameters.

    Change-Id: Ia68160601c2b2ba3eebde9963b3972f2a09ff84a

commit d9cf17ba33301cdb967bc5c0b9efbdfd6971eb0b
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Wed Jul 11 16:01:54 2012 +0100

    init.rc: Add framework2 to BOOTCLASSPATH

    Change-Id: I8c005ca795929558f34d0cee5cf93932c52d4b0f

commit 07096b46f221af48fef42f4e7cf9319a8c8f4414
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Wed Jul 4 15:26:57 2012 +0100

    init: Add a mechanism to extend the property service in device configs

    Instead of every so often adding a new set of stuff here for a specific
    device, let the device includes overload the property arrays. The
    new device_perms.h header documents it

    Change-Id: I477e27abebeb4b85abe5fcaf19333999b1625417

commit 1c541339b5d567a47de686a837df8ebdcdd3ce99
Author: Koushik Dutta <koushd@gmail.com>
Date:   Tue Jun 19 21:21:51 2012 -0700

    unpackbootimg: Need to also update the written file.

    Change-Id: I45faddbae85273c79b2837f97933634b6e70546f

commit b98b6046a88c7bd3ade91e4a3504876bc6005b6e
Author: Koushik Dutta <koushd@gmail.com>
Date:   Tue Jun 19 21:19:42 2012 -0700

    unpackbootimg: apparently mkbootimg no longer accepts hex values

    Change-Id: I95a33f7b40470e4500d418d863a65a75e7aa8499

commit fcb2617afd9662f4bc7ed8e90600d858e51db26b
Author: Koushik Dutta <koushd@gmail.com>
Date:   Tue Jun 19 19:00:37 2012 -0700

    unpackbootimg: Fix magic search.

    Change-Id: I68470b637556a08e48ff72b7ef8811cba13b04ad

commit 610ccab128554ccaaae1fa2ff06ada811a9d4377
Author: Koushik Dutta <koushd@gmail.com>
Date:   Tue Jun 19 16:57:20 2012 -0700

    unpackbootimg: Fix up the padding search in case the magic does not fall on a 8 byte boundary.

    Change-Id: I57471f9c2117cd7965b6958ea0aa88e356436da6

commit 898dd021c941dd1a437f2da8b013f284f01d4c71
Author: Koushik Dutta <koushd@gmail.com>
Date:   Tue Jun 19 16:51:46 2012 -0700

    Update unpackbootimg to verify the Android boot image magic value. It will also search the first 512 bytes for padding.

    Change-Id: I490cba05f2bb616a3f64e3271ecaa61eb9e64be8

commit f3e86113ceae0e58735ca99754d77b1b9d1a83b5
Author: Andrew Dodd <atd7@cornell.edu>
Date:   Mon Jun 18 21:19:19 2012 -0400

    init: Check for symlinks with lstat() not open()

    Using open() with an O_NOFOLLOW flag will result in a file falsely
    being determined to be a symlink if the open fails for another
    reason.

    For example, a character device that isn't ready due to the
    underlying hardware not being initialized yet will fail to open()

    An example of this are any CG2900 device files prior to
    execution of ste-cg29xx_ctrl

    This uses lstat() instead of open() with O_NOFOLLOW to check
    whether a file is a symlink or not.

    Change-Id: Ie0d8d94b426c84c29b1b04d41a4cc15536cb307c

commit 6894c59c200cbee446bb7df846a85d8b71bf0b1e
Author: Vishal Bhoj <vishal.bhoj@linaro.org>
Date:   Mon May 14 16:04:12 2012 +0000

    toolbox: rmmod: fix module unloading

    Replace "-" with "_" in module name. This would keep
    rmmod compatible with module-init-tools version of rmmod

    Change-Id: I4470d9a98bc2f299acd94859fca4403aee279d2b
    Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>

commit 826d75fb6dcefe8a6c6d4d54a7d215553945812a
Author: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date:   Wed Dec 7 13:30:56 2011 +0059

    libcutils: Fix aliasing violations

    Fix aliasing violtations that caused a need for the
    code to be compiled with -fno-strict-aliasing

    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

    libnetutils: Fix aliasing violations

    This allows us to build it with more compiler optimizations

    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

    libcutils: Fix aliasing violation

    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

    core: Fix build in ISO C++11 mode

    Fix compatibility with ISO C++11 compilers

    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
    Change-Id: I8f9aa775b5681d4d8c5202a1a1935acb4efa4171

    adb: Don't force -O2

    Don't force -O2 over -O3 -- the O2 hardcode is there to force
    optimizations, not to reduce them...

    Change-Id: Ic75eeb767db4926f519580fba8f5f7b8e593df4f
    Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

commit 3853a7c04ef517d940e566c65c293193ddbcd9c1
Author: Mattias Falk <mattias.falk@sonyericsson.com>
Date:   Fri May 13 16:25:38 2011 +0200

    Add error handling to SocketClient::sendData

    Return failure and set errno if mSocket isn't valid.

    Change-Id: I579114d435db46d0bb5682167ef34bebe061a8f8

commit 165ee42f9d91cead78ecc353848bfbf899a4112a
Author: Lars Svensson <lars1.svensson@sonyericsson.com>
Date:   Thu Jul 14 13:39:09 2011 +0200

    init: Add noexec mount option

    Change-Id: Ic13d66797a86d38432e79af0c3387ce986d0a19f

commit 5af16a29c54284377dc368e23bed32c9c295738a
Author: Jon Sawyer <jon@cunninglogic.com>
Date:   Sun Apr 15 12:24:32 2012 -0700

    Kindle Fire USB ID

    Adds Lab126's USB id to the known USB Devices

    Change-Id: I3cd5d90bba68123d5d3d2d67e1ab7d60137eb388
    Signed-off-by: Jon Sawyer <jon@cunninglogic.com>

commit dacc323abdd7cd8852e613ac288b6009bb20d91c
Author: codeworkx <daniel.hillenbrand@codeworkx.de>
Date:   Mon May 28 11:19:03 2012 +0200

    charger: allow custom charger res

    Example: BOARD_CHARGER_RES := device/samsung/galaxys2/res/charger

    Change-Id: I4cf359974475c06d219cb92c38efa2b8223ae367

commit 5e619b59976350830caa9be4ce98615c076181ec
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat May 26 22:27:58 2012 -0700

    charger: Add support for non-standard charging interfaces

     * Certain devices may have multiple battery devices or broken uevent
       reporting when a power supply is disconnected.
     * Add a new BOARD_BATTERY_DEVICE_NAME to force which device to monitor.

    Change-Id: I3045bf17a4d962cc5f0e6a951472916412ac0d0d

commit 910e55a75faac4f40e03622040ab0fc92b74f5b4
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat May 26 14:30:47 2012 -0700

    init: Add option to disable the initlogo

     * It looks like crap on some hardware due to different framebuffer
       formats. Just disable it if the option is set.

    Change-Id: Iad8ca25072fd16ca984050c6605bc1646821bee1

commit 317413813f5fda9b329bf152ae053cbfac8ea996
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Fri May 4 11:17:11 2012 +0200

    toolbox: implement rm -f flag

    this prevent compatibility errors in scripts (file "-f" not found)
    The force flag will not return an error if the file doesnt exist.

    Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

    Change-Id: I3267963284ee247629da5ab299e900c6e4a4ac68

commit 72890086251d0c6eb114818cbbdaf95a404c087e
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun May 20 21:28:58 2012 -0700

    init: Properly detect hardware revision

     * get_hardware_name was returning early if the hardware type was set on
       the command line, and not proceeding to parse it from /proc/cpuinfo
     * Fix it so that it always parses ro.revision :)

    Change-Id: Ib5d31d536066fc6829db756cb6e5f003a05bf440

commit f619c672d74c300a5a2b94671d41a18fc01d65df
Author: David Ng <dave@codeaurora.org>
Date:   Mon Mar 5 12:14:19 2012 -0800

    init: Increase maximum number of Android properties to 372

    (cherry picked from commit 2af5dedb813b5f2fb1355ccf6e4a5de2378665d6)

    Change-Id: Ic4b45a10196b24ba2e4798fef45a125f9f3dbf15

commit 1d88d954525172d6854bb75d29134a2a88d62277
Author: Alex Yakavenka <ayakav@codeaurora.org>
Date:   Mon Nov 14 17:25:04 2011 +0900

    Add required permissions and files for data

     - Add /data/radio
     - Set gateway property after DNS
     - Allow radio users to set properties associated with
       all rmnet interfaces. Not just rmnet0

    Change-Id: Ia60fcb8f90aa73ffd40e839b93356ee50a9e5072

commit 912f3a5a9503845c84a0a5cf918bb3f1fbfd4ebc
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed May 9 19:51:24 2012 -0700

    init: Add an emmc-specific configuration file

     * Load init.emmc.rc if emmc_boot is set
     * This makes startup much cleaner for devices with a mess of vendor RC
       configurations.

    Change-Id: Ifa6d0ca104c11e037740690da0ff6284c2f4a3ca

commit ebdb2805bb71c6406eab24b90dd5210f2fd6c642
Author: Sebastian Schmidt <yath@yath.de>
Date:   Sat Apr 14 11:52:43 2012 +0200

    Increase CMD_ARGS_MAX in FrameworkListener

    This increases the maximum number of arguments for a framework command
    from 16 to 32. 16 arguments are already used by NetworkManagementService
    .startTethering().

    Change-Id: I0b369889f7f790f43f9c89da0c4e133a342debd7

commit c8a980f58f72d33a6f079b9839db353475a56609
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Jan 2 19:18:02 2012 +0000

    init: Let radio user manipulate service properties

    I'm seeing some devices (with broadcom's btld) in which the
    radio services (RIL) use the service. namespace to pass or store
    data...

    Conflicts:

    	init/property_service.c

    Change-Id: I6e3177689a12b0925064e615408bc1e0f175bcf3

commit 12fee5254eaa0a9111f4364490ddcfd936f1ee13
Author: Warren Togami <wtogami@gmail.com>
Date:   Sat Mar 3 23:48:46 2012 -1000

    Modular backuptool.sh.  Executes backup and restore methods defined in arbitrary /system/addon.d/*.sh scripts.

    Set permissions on /system/addon.d/ and files within.

    Patch Series
    ============
    http://review.cyanogenmod.com/#change,13265
    CyanogenMod/android_build
      * edify generator
    http://review.cyanogenmod.com/#change,13266
    CyanogenMod/android_system_core
      * permissions on /system/addon.d
    http://review.cyanogenmod.com/#change,13267
    CyanogenMod/android_vendor_cm
      * 50-cm.sh reference backup script
      * modular backuptool.sh
      * support backuptool.functions used by /system/addon.d/*.sh scripts

    Change-Id: I4f1464ea8d55f45d47ba760a7a448036a46feb00

commit cdb66803043626eaaf51499d6b88682ab4dd583e
Author: Giulio Cervera <giulio.cervera@gmail.com>
Date:   Thu Mar 1 12:36:24 2012 +0100

    core: allow radio users to access all rmnet* interface

    Change-Id: Ibc3bf9654cf68362369422f82afe53ef86e3e710

commit 3c56454c95eec563b98dc8554e5621c3ba547c75
Author: Mike Kasick <mike@kasick.org>
Date:   Mon Feb 6 10:32:34 2012 -0500

    init: Don't confuse do_exec with other exiting processes.

    The waitpid call in do_exec may return early with EINTR when init receives
    a signal, e.g., a SIGCHLD from an exiting service process.  do_exec should
    check waitpid for an EINTR "error", to ensure that it returns only after
    waiting on its child process.

commit abe57d0b4e994e31eb31ec98dfa6d4b74e29502e
Author: Mike Kasick <mike@kasick.org>
Date:   Mon Feb 6 10:32:13 2012 -0500

    init: Never allow two same-service processes to exist simultaneously.

    A stopping service now remains in SVC_RUNNING state until its exiting
    process has been reaped by waitpid.  This prevents a "stop, start" sequence
    from spawning a second service process before resources held by the first
    are released.  However, a "stop, start" pair _will_ restart the service
    after exit (unless critical or oneshot).

    This scenario was originally special-cased by the SVC_RESTART state used by
    the restart command.  However, we have observed instances where services
    are, unintentionally, stopped and started "too quickly," and so
    simultaneous processes for the same service should never be allowed.  Note
    the SVC_RESTART state (and restart) command is still useful to explicitly
    restart critical and oneshot services, for which the "stop, start"
    procedure is not intended.

commit b70a821ec39c1a93d3f1e71dac086f71e874b858
Author: Michaël Burtin <bukington@gmail.com>
Date:   Sun Feb 5 21:32:22 2012 +0100

    run sysinit during boot

    ported from CM7

    Change-Id: I08f8e23d83ce45366ff2a994d110dd3431efa017

commit af1ea6604fa4cb929e30a59b3b7da5ed70862416
Author: Michaël Burtin <bukington@gmail.com>
Date:   Sun Feb 5 00:55:17 2012 +0100

    set /system/etc/init.d/* permissions

    ported from CM7

    Change-Id: I279d78679f7d779d6cd6bbc6c834d94706937ae8

commit cbaad4499f3e5d128dbafb23696a8619cbfbc704
Author: Dalingrin <dalingrin@gmail.com>
Date:   Mon Jan 30 01:07:15 2012 -0600

    Allow system to call custom reboot cmd

    Change-Id: Id726b46f644e72c9a67d64777abe1e3dbdbc0a82

commit e889a4746b6f3cd1c6749312c255b14eedc5f778
Author: Mike Kasick <mike@kasick.org>
Date:   Sun Jan 29 12:56:50 2012 -0500

    Restart oneshot services when manually restarted.

    Restores manual restart behavior of oneshot services prior to I9935b519.

    Change-Id: Iadfc8462838e3ad2dbbe38d76ba2ef0ce955f722

commit b433d3c6238e47df814a570c8d0389a72facc7d9
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Jan 14 17:04:22 2012 -0800

    adbd: Disable "adb root" by system property (2/3)

     * Require persist.sys.root_access=1 on non-eng debuggable builds

    Change-Id: Iedab030e81ffb525fed64aed80cf0014f3e07073

commit 2c45eb3e4f647a6958085cb08f3d35342d6f3a10
Author: KalimochoAz <calimochoazucarado@gmail.com>
Date:   Sat Jan 28 16:16:38 2012 -0800

    rootdir: Change sysfs permissions to allow user control ksm

    Change-Id: I8a57a3d3bb7b5cd34d58416ca8778dfd6df3111b

commit 5be1f622addbe10e60144b420d5255f40535577a
Author: NameLess, the Jedi <yoddah@gmail.com>
Date:   Fri Dec 31 10:00:10 2010 +0100

    Allow 'system' user to modify cpufreq control files

    This is needed by new CPU Settings in CMParts

    Change-Id: I0ec4e0b1705670034a433df549b2895985c476af

commit 49acefbe37b4d6e3a884c7697c4c010dc499be11
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Jan 25 21:55:52 2012 -0800

    Revert "core: port forward load /system/etc/init.rc.local & run /system/bin/sysinit"

    This reverts commit 9c83c769e353fb60942587eacdec2f29de733b48.

commit 68fd988a33d2683b41926e9e4e53f95de4984749
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Dec 31 11:30:07 2010 +0100

    core: port forward load /system/etc/init.rc.local & run /system/bin/sysinit

    Change-Id: Ic691c646558ddf842856f97236d055f5664b65f7

commit d3a29d15fe834b02105c382af9cccaccbe38b314
Author: Won-Kyu Park <wkpark@gmail.com>
Date:   Sun Jan 22 17:56:40 2012 +0900

    Create /cache/dalvik-cache

    manually imported commit ba422208f99552f12f34e6f28cc44445f0e6d9e0 by ctso

    Change-Id: I617573a14a8cf08d353804016b3351186720d199

commit 9d1a567eb0d6ac8d0040228e7c41668c8e3eb37e
Author: Mike Kasick <mike@kasick.org>
Date:   Wed Jan 25 23:48:46 2012 -0500

    Safely restart services to avoid race conditions.

    At present, service restarts exhibit a race condition whereby the new
    (restarting) service process is often spawned before the old (stopping)
    process has terminated.  This may result in the new service process failing
    to acquire a limited resource (file lock, socket bind, etc.) that the old
    process has not yet released.

    The new method preforms a safe service restart by stopping the service,
    waiting for the old service process to terminate, and (only then) start the
    new service process.  In the event of "restarting" an already stopped
    service, the previous behavior is maintained whereby the service is simply
    started.

commit d0936023862581c3da6472a049870622f3aa31d3
Author: Giulio Cervera <giulio.cervera@gmail.com>
Date:   Sun Jan 15 13:37:34 2012 +0100

    log: more qcom radio tag

    Change-Id: I408d0747f7194c4026654b928610e5ed994bbcdb

commit f0d96dd7b97e1f338dcfa1ba04546dd0cb579c6e
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Jan 14 14:28:36 2012 -0800

    rootdir: Add support for ADB-over-network

    Change-Id: I7ae1df85f37cdb2f635403ab342cb978a3c77388

commit 8bfc5108e4aa10fef0b9e51d7da57a8e7ecdf2e7
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Fri Oct 28 13:16:30 2011 +0200

    handle motorola user ids, if MOTOROLA_UIDS is defined

    some of these are required by proprietary binary apps
    and tools like lsof which report errors on unknown user 9000

    A lot of projects use this android_filesystem_config.h,
    so a global CFLAGS is better to handle this in BoardConfig.mk

    Added latest ones for OSH (webtop) and whisper (used in pds)

    Change-Id: I7e92bacfcac418cd9f21e67543a5789a292137a3

commit 973311bf110a57a618a70de3a37b7309dd8c9020
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Mon Dec 19 06:31:31 2011 +0100

    init: implement a new 'log' command, useful to debug property events

    liblog is not usable, because stderr and stdout are redirected to
    /dev/null to control the android log output.

    Only forked processes are able to write to the android logs...

    Note: accept parameters: log [-t topic] [-p level] <message>
          limit : strings beginning with "--" are not handled

    Change-Id: I2fbf7422e0085d4cdf1bba6511413d1f796d4555

commit 87e87fc7bfa2a033aabd5b339526f35e85fa6bee
Author: Prashant Somashekar <prashsomash@gmail.com>
Date:   Sat Dec 17 17:26:54 2011 -0500

    init: add detection of charging mode

    -when BOARD_CHARGING_MODE_BOOTING_LPM is set to a path_to_sysfs_attribute
     then it and lpm.rc will be read accordingly.

    -adapted from techomancer's original change:
     (add detection of charging mode, remove the code for parsing param.lfs,
      since it is not needed)
     http://goo.gl/I19GG

    Change-Id: I64c2379225e00afaaf17ee03eab67546781668f8

commit 7a82bfb79c5d7e376308af08bb2541c2ed09785e
Author: Koushik Dutta <koushd@gmail.com>
Date:   Mon Aug 2 11:23:47 2010 -0700

    unpackbootimg (squashed)

    unpackbootimg ported forward from eclair

    Change-Id: I74d2df0b47d40e7105cc58c2b05f8f383dc7f8a0

    port forward pagesize arg from eclair

    Change-Id: Ia789a4f392a3890aa0efa7efb42032482b48beb0

    unpackbootimg should output BOARD_PAGE_SIZE

    Change-Id: Ieb5cda01943a33da97eee4d025f56c2c6e7560e8

    output page size in mkbootimg

    add an option to override the pagesize for boot images created by nubs. ie, acer liquid mkliquidbootimg.

    Change-Id: Ie0c7e67edf5ae59019517e72b9be8c0b81388e41

commit f01fd5aa81f0b872986823ebe6837deddf67b7b4
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Dec 4 13:39:02 2011 -0800

    init: Support for emmc boot and init.target.rc

     * Via CodeAurora

    Change-Id: Iaa9ed356574f364d8061e8941cffc3d458efc603

commit 5a05b86149fc6932aa93c574dcccd1c0f677c63e
Author: Naveen Kalla <nkalla@codeaurora.org>
Date:   Mon Dec 20 14:37:49 2010 -0800

    Add group qcom_oncrpc and give permissions to ril-daemon and /dev/oncrpc

    Change-Id: I022aae4a81c720a026ea6c1a41bda30acbe60224

commit 8df0d9c3578427e4e7fb18f80697670655eb776c
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Thu Dec 1 04:35:39 2011 +0100

    RECOVERY_PRE_COMMAND_CLEAR_REASON and extended reboot arguments

    fix the 2 new warnings created by our 4-lines recovery patch ;p

    Allow also to override toolbox reboot applet, for bootmenu

    Change-Id: I975af19a8f295d1e341c7433f96f669db611f89c

commit 26e7a088600ea0d540bf4f82f510a2052f3f9b1e
Author: Arne Coucheron <arco68@gmail.com>
Date:   Wed Nov 30 09:14:51 2011 +0100

    debuggerd: Extend condition for exclusion of the fconstd instruction

    The fconstd instruction only exists in ARM cores with VFPv3 or
    later. Currently all supported ARMv6 targets do not have VFPv3 or
    later, so let's just extend based on this trend.

    Change-Id: Icbbaadb69564b9bab7b55fdada408247c214f038

commit 44070145d28aae267b1c31f74d96cc2c2d4770d8
Author: Danesh M <daneshm90@gmail.com>
Date:   Fri Nov 25 20:53:19 2011 -0500

    libcutils : reboot mount fix

    On aries for eg, cache needs to be rw for the RECOVERY_PRE_COMMAND to
    work because we write to /cache/.startrecovery

    This patchset moves the RECOVERY_PRE_COMMAND prior to the remount.

    Change-Id: Iab1da9a15e64e8831b04e4eb21d824de5f8bd0eb

commit 6456a4b853463003bc20bcf5a0aec37bd16fa31d
Author: Andrew Sutherland <dr3wsuth3rland@gmail.com>
Date:   Thu Nov 24 23:03:22 2011 -0600

    add missing string.h include needed for memset

    Change-Id: Ieeb9e95919d1bea183f01da9fbab0c5c8c8d1925

commit 418954f50ff22300c6663f2be058ee440f31a032
Author: atinm <atinm.dev@gmail.com>
Date:   Tue May 3 00:26:33 2011 -0400

    Use RECOVERY_PRE_COMMAND before calling __reboot() recovery

    For the Power menu,
    frameworks/base/core/jni/android_os_Power.cpp#L180
    already uses RECOVERY_PRE_COMMAND if
    TARGET_RECOVERY_PRE_COMMAND is defined in the
    BoardConfig.mk for a device to make a system() call before
    calling __reboot() for recovery. This commit adds
    the same thing to the other places that we know we are
    getting into recovery using __reboot(), namely,
    adb reboot recovery, the reboot binary and init
    in the case of errors.

    Change-Id: If0a9c7f22de2aa187c921b60ad5edd77b49e095d

commit bb9f0bbcaf41ee39b24c4ef99766976a0a922a25
Author: jerpelea <jerpelea@gmail.com>
Date:   Tue Nov 22 10:32:24 2011 +0200

    init: Include extra init file in /system/etc/init.local.rc

    Change-Id: I2324b3be767a4bf2e0d32645a355f14e0b894c5b

commit 914bd5da9f26bd35333d6273e18347b8a3c2a776
Author: Koushik Dutta <koushd@gmail.com>
Date:   Sun Nov 20 21:11:20 2011 -0800

    do not install recovery on boot

commit 770c8e1810df146c15aa7ff02d6d3304fa4742c7
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Nov 13 03:54:26 2010 -0500

    liblog: Move kineto and qcom RIL messages to radio log

    Squashed commits from CM7

       liblog: I <3 you Kineto, but STFU.

       Kineto's native library obliterates the logs with debug info, which
       makes me a sad panda when trying to debug other things. Send it to the
       RADIO bucket instead.

       Change-Id: I6e6a7a54a84d41cd189f9eb48518b990b8b13a89

       Added QCRIL to filter rules.

       QCRIL from LG P500 generate too much logcat output (about 20 lines per second) so it will be good to filter it.

       Change-Id: I29d1fcd16d0fbf9ba456b09087c33c21242faa8e

       Mecha: Move qc-ril related logging to the radio log

       Change-Id: Ibf4eb91068b53e389ca437bcc4e52d66be92639a

    Change-Id: I8e9d646fe6f7910205a3c19702a283bdb6921342

commit 1e07b11dd8bbdb1ecdefa2db07605f11737c0760
Author: Emilio López <turl@tuxfamily.org>
Date:   Wed Nov 16 20:59:10 2011 +0000

    Stub property_set_sync

    This is needed by Motorola RILs

    Change-Id: If4ede6b958cde4ee4450fef7a3106d52bfb5d5d1

commit 2f0ed0d3ced82e53b1fc1f994c6bd3e97683264c
Author: Emilio López <turl@tuxfamily.org>
Date:   Wed Nov 16 02:38:32 2011 +0000

    init: Implement exec support

    Code copied from CM7 implementation by Steve Kondik

    Change-Id: Ie8f11e9dc9e552aa7a4fe354995daaf8f0d99a11

commit 076aeff4ec56b246e31ffa2c1ddf919d2c10817f
Author: Pierre Zurek <pierrezurek@gmail.com>
Date:   Sun Oct 17 22:39:37 2010 +0200

    ADB Logcat colored output.

    This patch adds a new '-C' option to logcat so that the output is
    colored with colors similar to the ones in DDMS.
    Simply type "adb logcat -C" to use it.
    Works well with bash in gnome-terminal.

    Change-Id: Ie72199ecca0e04f2082c993f5763646bb09da61ea

commit 743c92dc05abd68b40d6d2b220eede17de7a1073
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Sun Apr 3 19:38:18 2011 +0100

    init: Add net device permission controls for LGE devices

    These are used by lge-ril to control the state of the mobiledata
    interfaces

    Change-Id: Ia869f08564c1f4907240289a32a10e0f3413d8a9a

commit bc7bff1b10ab1e344b808f0e7e2884ac70f8df12
Author: Koushik K. Dutta <koushd@gmail.com>
Date:   Mon Feb 22 23:22:36 2010 -0800

    Squashed adb fixes.

    fix up adb to prefer /sbin/sh if it exists

    allow always insecure

    Change-Id: I5c15731c95d123488e90aaeac5b497f556b53363

    Conflicts:

    	adb/Android.mk

Change-Id: Ib3ae3720ee0eac95e52d7cc11704559e336725fd
Merge branch 'master' into HEAD

Conflicts:
	mkbootimg/mkbootimg.c

Change-Id: I363b94358cbb4c99cf825afce9159653612762e5