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

Commit 55664906 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Disable vendor id filtering for Linux. 

It's time we switched to blacklisting any problematic devices rather than
slowly whitelisting the entire world. This seems to work for me, but let's
see how other people get on before coming back to actually remove the list.

We'll also need to find a Mac to test the equivalent Mac change.

Change-Id: I2bf583a27f9a3f98ef006ea62b906a4f89960507
parent 46ee85fc

adb/transport_usb.c

+1 −17
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 
#define  TRACE_TAG  TRACE_TRANSPORT

#include "adb.h"



#if ADB_HOST

#include "usb_vendors.h"

#endif



#ifdef HAVE_BIG_ENDIAN

#define H4(x)	(((x) & 0xFF000000) >> 24) | (((x) & 0x00FF0000) >> 8) | (((x) & 0x0000FF00) << 8) | (((x) & 0x000000FF) << 24)

static inline void fix_endians(apacket *p)
@@ -131,18 +127,6 @@ void init_usb_transport(atransport *t, usb_handle *h, int state) 
#if ADB_HOST

int is_adb_interface(int vid, int pid, int usb_class, int usb_subclass, int usb_protocol)

{

    unsigned i;

    for (i = 0; i < vendorIdCount; i++) {

        if (vid == vendorIds[i]) {

            if (usb_class == ADB_CLASS && usb_subclass == ADB_SUBCLASS &&

                    usb_protocol == ADB_PROTOCOL) {

                return 1;

            }



            return 0;

        }

    }



    return 0;

    return (usb_class == ADB_CLASS && usb_subclass == ADB_SUBCLASS && usb_protocol == ADB_PROTOCOL);

}

#endif

adb/usb_vendors.c

+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ int builtInVendorIds[] = { 
int vendorIds[VENDOR_COUNT_MAX];

unsigned vendorIdCount = 0;



int get_adb_usb_ini(char* buff, size_t len);

static int get_adb_usb_ini(char* buff, size_t len);



void usb_vendors_init(void)

{
@@ -348,7 +348,7 @@ void usb_vendors_init(void) 
/* Utils methods */



/* builds the path to the adb vendor id file. returns 0 if success */

int build_path(char* buff, size_t len, const char* format, const char* home)

static int build_path(char* buff, size_t len, const char* format, const char* home)

{

    if (snprintf(buff, len, format, home, ANDROID_PATH, ANDROID_ADB_INI) >= (signed)len) {

        return 1;
@@ -358,7 +358,7 @@ int build_path(char* buff, size_t len, const char* format, const char* home) 
}



/* fills buff with the path to the adb vendor id file. returns 0 if success */

int get_adb_usb_ini(char* buff, size_t len)

static int get_adb_usb_ini(char* buff, size_t len)

{

#ifdef _WIN32

    const char* home = getenv("ANDROID_SDK_HOME");