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

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

merge from open-source master

parents 988ad28e 91a54c11

adb/commandline.c

+12 −4
Original line number Diff line number Diff line
@@ -151,8 +151,9 @@ void help() 
        "  adb status-window            - continuously print device status for a specified device\n"

        "  adb remount                  - remounts the /system partition on the device read-write\n"

        "  adb reboot [bootloader|recovery] - reboots the device, optionally into the bootloader or recovery program\n"

        "  adb reboot-bootloader        - reboots the device into the bootloader\n"

        "  adb root                     - restarts the adbd daemon with root permissions\n"

        "  adb usb                      - restarts the adbd daemon listening on USB"

        "  adb usb                      - restarts the adbd daemon listening on USB\n"

        "  adb tcpip <port>             - restarts the adbd daemon listening on TCP on the specified port"

        "\n"

        "networking:\n"
@@ -929,10 +930,13 @@ top: 
    }



    if(!strcmp(argv[0], "remount") || !strcmp(argv[0], "reboot")

            || !strcmp(argv[0], "reboot-bootloader")

            || !strcmp(argv[0], "tcpip") || !strcmp(argv[0], "usb")

            || !strcmp(argv[0], "root")) {

        char command[100];

        if (argc > 1)

        if (!strcmp(argv[0], "reboot-bootloader"))

            snprintf(command, sizeof(command), "reboot:bootloader");

        else if (argc > 1)

            snprintf(command, sizeof(command), "%s:%s", argv[0], argv[1]);

        else

            snprintf(command, sizeof(command), "%s:", argv[0]);
@@ -991,6 +995,10 @@ top: 
        if(argc != 3) return usage();

        if (serial) {

            snprintf(buf, sizeof buf, "host-serial:%s:forward:%s;%s",serial, argv[1], argv[2]);

        } else if (ttype == kTransportUsb) {

            snprintf(buf, sizeof buf, "host-usb:forward:%s;%s", argv[1], argv[2]);

        } else if (ttype == kTransportLocal) {

            snprintf(buf, sizeof buf, "host-local:forward:%s;%s", argv[1], argv[2]);

        } else {

            snprintf(buf, sizeof buf, "host:forward:%s;%s", argv[1], argv[2]);

        }

adb/usb_vendors.c

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ 
#define VENDOR_ID_ACER          0x0502

// Sony Ericsson's USB Vendor ID

#define VENDOR_ID_SONY_ERICSSON 0x0FCE

// Foxconn's USB Vendor ID

#define VENDOR_ID_FOXCONN       0x0489

// Dell's USB Vendor ID

#define VENDOR_ID_DELL          0x413c





/** built-in vendor list */

int builtInVendorIds[] = {
@@ -62,6 +67,8 @@ int builtInVendorIds[] = { 
    VENDOR_ID_HUAWEI,

    VENDOR_ID_ACER,

    VENDOR_ID_SONY_ERICSSON,

    VENDOR_ID_FOXCONN,

    VENDOR_ID_DELL,

};



#define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))

include/arch/darwin-x86/AndroidConfig.h

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
 */

#if (defined(__ppc__) || defined(__ppc64__))

#   define HAVE_BIG_ENDIAN

#elif defined(__i386__)

#elif (defined(__i386__) || defined(__x86_64__))

#   define HAVE_LITTLE_ENDIAN

#endif
@@ -219,7 +219,7 @@ 
 */

#if (defined(__ppc__) || defined(__ppc64__))

#   define ARCH_PPC

#elif defined(__i386__)

#elif (defined(__i386__) || defined(__x86_64__))

#   define ARCH_X86

#endif