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

Commit f614d64d authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake_rel/...@140373

parent e037fd7e

fastboot/fastboot.c

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ int match_fastboot(usb_ifc_info *info) 
{

    if(!(vendor_id && (info->dev_vendor == vendor_id)) &&

       (info->dev_vendor != 0x18d1) &&

       (info->dev_vendor != 0x0451) &&

       (info->dev_vendor != 0x0bb4)) return -1;

    if(info->ifc_class != 0xff) return -1;

    if(info->ifc_subclass != 0x42) return -1;

rootdir/etc/init.goldfish.rc

+1 −3
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ service goldfish-setup /system/etc/init.goldfish.sh 
    oneshot



service qemud /system/bin/qemud

    socket qemud_gsm     stream 666

    socket qemud_gps     stream 666

    socket qemud_control stream 666

    socket qemud    stream 666

    oneshot



# -Q is a special logcat option that forces the

rootdir/init.rc

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ on boot 
    chown system system /sys/class/leds/keyboard-backlight/brightness

    chown system system /sys/class/leds/lcd-backlight/brightness

    chown system system /sys/class/leds/button-backlight/brightness

    chown system system /sys/class/leds/jogball-backlight/brightness

    chown system system /sys/class/leds/red/brightness

    chown system system /sys/class/leds/green/brightness

    chown system system /sys/class/leds/blue/brightness

vold/blkdev.c

+6 −2
Original line number Diff line number Diff line
@@ -134,8 +134,12 @@ int blkdev_refresh(blkdev_t *blk) 
        struct dos_partition part;

        int part_no = blk->minor -1;



        if (part_no < 4) {

            dos_partition_dec(block + DOSPARTOFF + part_no * sizeof(struct dos_partition), &part);

            blk->part_type = part.dp_typ;

        } else {

            LOGW("Skipping partition %d", part_no);

        }

    }



 out:

vold/format.c

+7 −8
Original line number Diff line number Diff line
@@ -37,15 +37,14 @@ int format_partition(blkdev_t *part, char *type) 
    devpath = blkdev_get_devpath(part);



    if (!strcmp(type, FORMAT_TYPE_FAT32)) {

        char *args[7];

        char *args[6];

        args[0] = MKDOSFS_PATH;

        args[1] = "-F 32";

        args[2] = "-c 32";

        args[3] = "-n 2";

        args[4] = "-O android";

        args[5] = devpath;

        args[6] = NULL;

        rc = logwrap(6, args);

        args[1] = "-c 32";

        args[2] = "-n 2";

        args[3] = "-O android";

        args[4] = devpath;

        args[5] = NULL;

        rc = logwrap(5, args);

    } else {

        char *args[7];

        args[0] = MKE2FS_PATH;