Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b8a83c2 authored by Steve Kondik's avatar Steve Kondik
Browse files

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

Android 4.2.2 release 1
parents 8d775577 4f247d75

fs_mgr/fs_mgr.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -523,11 +523,11 @@ int fs_mgr_do_mount(char *fstab_file, char *n_name, char *n_blk_dev, char *tmp_m 
        /* We found our match */

        /* We found our match */

        /* First check the filesystem if requested */

        /* First check the filesystem if requested */

        if (fstab[i].fs_mgr_flags & MF_WAIT) {

        if (fstab[i].fs_mgr_flags & MF_WAIT) {

            wait_for_file(fstab[i].blk_dev, WAIT_TIMEOUT);

            wait_for_file(n_blk_dev, WAIT_TIMEOUT);

        }

        }





        if (fstab[i].fs_mgr_flags & MF_CHECK) {

        if (fstab[i].fs_mgr_flags & MF_CHECK) {

            check_fs(fstab[i].blk_dev, fstab[i].type, fstab[i].mnt_point);

            check_fs(n_blk_dev, fstab[i].type, fstab[i].mnt_point);

        }

        }





        /* Now mount it where requested */

        /* Now mount it where requested */

libcorkscrew/arch-arm/ptrace-arm.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -29,12 +29,15 @@ 
static void load_exidx_header(pid_t pid, map_info_t* mi,

static void load_exidx_header(pid_t pid, map_info_t* mi,

        uintptr_t* out_exidx_start, size_t* out_exidx_size) {

        uintptr_t* out_exidx_start, size_t* out_exidx_size) {

    uint32_t elf_phoff;

    uint32_t elf_phoff;

    uint32_t elf_phentsize_phnum;

    uint32_t elf_phentsize_ehsize;

    uint32_t elf_shentsize_phnum;

    if (try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phoff), &elf_phoff)

    if (try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phoff), &elf_phoff)

            && try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_ehsize),

                    &elf_phentsize_ehsize)

            && try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phnum),

            && try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phnum),

                    &elf_phentsize_phnum)) {

                    &elf_shentsize_phnum)) {

        uint32_t elf_phentsize = elf_phentsize_phnum >> 16;

        uint32_t elf_phentsize = elf_phentsize_ehsize >> 16;

        uint32_t elf_phnum = elf_phentsize_phnum & 0xffff;

        uint32_t elf_phnum = elf_shentsize_phnum & 0xffff;

        for (uint32_t i = 0; i < elf_phnum; i++) {

        for (uint32_t i = 0; i < elf_phnum; i++) {

            uintptr_t elf_phdr = mi->start + elf_phoff + i * elf_phentsize;

            uintptr_t elf_phdr = mi->start + elf_phoff + i * elf_phentsize;

            uint32_t elf_phdr_type;

            uint32_t elf_phdr_type;

rootdir/init.rc

+2 −0
Original line number Original line Diff line number Diff line
@@ -303,6 +303,8 @@ on boot 
    chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse

    chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse

    chown system system /sys/devices/system/cpu/cpufreq/interactive/input_boost

    chown system system /sys/devices/system/cpu/cpufreq/interactive/input_boost

    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/input_boost

    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/input_boost

    chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration

    chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration





    # Assume SMP uses shared cpufreq policy for all CPUs

    # Assume SMP uses shared cpufreq policy for all CPUs

    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor

    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor

rootdir/init.usb.rc

+1 −0
Original line number Original line Diff line number Diff line
@@ -88,4 +88,5 @@ on property:sys.usb.config=accessory,audio_source,adb 
# Used to set USB configuration at boot and to switch the configuration

# Used to set USB configuration at boot and to switch the configuration

# when changing the default configuration

# when changing the default configuration

on property:persist.sys.usb.config=*

on property:persist.sys.usb.config=*

    setprop sys.usb.config none

    setprop sys.usb.config ${persist.sys.usb.config}
 
    setprop sys.usb.config ${persist.sys.usb.config}