From 8b05099aa1f8a85485cb53994dae55dc6746bb7c Mon Sep 17 00:00:00 2001
From: Joe Da Silva <digital@joescat.com>
Date: Thu, 21 Jan 2016 06:52:16 -0800
Subject: [PATCH 1/5] Fixes -> Rules too broad for Asus; catching my bluetooth
 dongle. #72

Also if vendor==Asus then skip other tests and go directly to match_found.
---
 51-android.rules | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/51-android.rules b/51-android.rules
index 2c1490b..d9b1a5d 100644
--- a/51-android.rules
+++ b/51-android.rules
@@ -38,16 +38,17 @@ GOTO="android_usb_rule_match"
 LABEL="not_Archos"
 
 #	Asus
-ATTR{idVendor}=="0b05", ENV{adb_user}="yes"
-#		Zenphone 5
-#			normal
-ATTR{idProduct}=="4c90"
-#			USB Debugging
+ATTR{idVendor}!="0b05", GOTO="not_Asus"
+#		False positive - accessory
+ATTR{idProduct}=="1???", GOTO="android_usb_rules_end"
+ENV{adb_user}="yes"
+#		Zenphone 5 (4c90=normal,4c91=debug,4daf=Fastboot)
 ATTR{idProduct}=="4c91", SYMLINK+="android_adb"
-#			Fastboot
 ATTR{idProduct}=="4daf", SYMLINK+="android_fastboot"
 #			Tegra APX
 ATTR{idProduct}=="7030"
+GOTO="android_usb_rule_match"
+LABEL="not_Asus"
 
 #	Azpen Onda
 ATTR{idVendor}=="1f3a", ENV{adb_user}="yes"

From aec12bcd527a67f69b76b6e9c6a84cac68c99a48 Mon Sep 17 00:00:00 2001
From: Joe Da Silva <digital@joescat.com>
Date: Thu, 21 Jan 2016 07:03:25 -0800
Subject: [PATCH 2/5] Update XiaoMi to handle several devices, exit sooner if
 yes/no

---
 51-android.rules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/51-android.rules b/51-android.rules
index d9b1a5d..ffde561 100644
--- a/51-android.rules
+++ b/51-android.rules
@@ -431,7 +431,8 @@ ATTR{idProduct}=="1355"
 ATTR{idProduct}=="1354", SYMLINK+="android_adb"
 
 #	XiaoMi
-ATTR{idVendor}=="2717", ENV{adb_user}="yes"
+ATTR{idVendor}!="2717", GOTO="not_XiaoMi"
+ENV{adb_user}="yes"
 #		Mi2A
 ATTR{idProduct}=="904e", SYMLINK+="android_adb"
 ATTR{idProduct}=="9039", SYMLINK+="android_adb"
@@ -451,6 +452,8 @@ ATTR{idProduct}=="1368", SYMLINK+="android_adb"
 ATTR{idProduct}=="1318", SYMLINK+="android_adb"
 #		RedMi / RedMi Note 4G WCDMA (Usb+Debug)
 ATTR{idProduct}=="1328", SYMLINK+="android_adb"
+GOTO="android_usb_rule_match"
+LABEL="not_XiaoMi"
 
 # Skip other vendor tests
 LABEL="android_usb_rule_match"

From 71bdd54a1ee85d20ce8bcf28bf8a382659cc28b8 Mon Sep 17 00:00:00 2001
From: Joe Da Silva <digital@joescat.com>
Date: Thu, 21 Jan 2016 07:05:34 -0800
Subject: [PATCH 3/5] Place ZTE in alphabetic order

---
 51-android.rules | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/51-android.rules b/51-android.rules
index ffde561..a2a5cf8 100644
--- a/51-android.rules
+++ b/51-android.rules
@@ -421,15 +421,6 @@ ATTR{idVendor}=="0930", ENV{adb_user}="yes"
 #	WEARNERS
 ATTR{idVendor}=="05c6", ENV{adb_user}="yes"
 
-#	ZTE
-ATTR{idVendor}=="19d2", ENV{adb_user}="yes"
-#		Blade
-ATTR{idProduct}=="1353"
-ATTR{idProduct}=="1351", SYMLINK+="android_adb"
-#		Blade S (Crescent, Orange San Francisco 2)
-ATTR{idProduct}=="1355"
-ATTR{idProduct}=="1354", SYMLINK+="android_adb"
-
 #	XiaoMi
 ATTR{idVendor}!="2717", GOTO="not_XiaoMi"
 ENV{adb_user}="yes"
@@ -455,6 +446,15 @@ ATTR{idProduct}=="1328", SYMLINK+="android_adb"
 GOTO="android_usb_rule_match"
 LABEL="not_XiaoMi"
 
+#	ZTE
+ATTR{idVendor}=="19d2", ENV{adb_user}="yes"
+#		Blade
+ATTR{idProduct}=="1353"
+ATTR{idProduct}=="1351", SYMLINK+="android_adb"
+#		Blade S (Crescent, Orange San Francisco 2)
+ATTR{idProduct}=="1355"
+ATTR{idProduct}=="1354", SYMLINK+="android_adb"
+
 # Skip other vendor tests
 LABEL="android_usb_rule_match"
 

From 9a17ff1248b617b8842cc9ab54fd5cb02107d09a Mon Sep 17 00:00:00 2001
From: Joe Da Silva <digital@joescat.com>
Date: Thu, 21 Jan 2016 07:10:19 -0800
Subject: [PATCH 4/5] Update Huawei to handle several devices, exit sooner if
 yes/no

---
 51-android.rules | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/51-android.rules b/51-android.rules
index a2a5cf8..425d903 100644
--- a/51-android.rules
+++ b/51-android.rules
@@ -180,17 +180,18 @@ GOTO="android_usb_rule_match"
 LABEL="not_HTC"
 
 #	Huawei
-ATTR{idVendor}=="12d1", ENV{adb_user}="yes"
+ATTR{idVendor}!="12d1", GOTO="not_Huawei"
+ENV{adb_user}="yes"
 #		IDEOS
-ATTR{idProduct}=="1038", SYMLINK+="android_adb"
-ATTR{idProduct}=="1038", SYMLINK+="android_fastboot"
+ATTR{idProduct}=="1038", SYMLINK+="android_adb", SYMLINK+="android_fastboot"
 #		U8850 Vision
-ATTR{idProduct}=="1021", SYMLINK+="android_adb"
-ATTR{idProduct}=="1021", SYMLINK+="android_fastboot"
+ATTR{idProduct}=="1021", SYMLINK+="android_adb", SYMLINK+="android_fastboot"
 #		HiKey adb
 ATTR{idProduct}=="1057", SYMLINK+="android_adb"
 #		HiKey usbnet
 ATTR{idProduct}=="1050", SYMLINK+="android_adb"
+GOTO="android_usb_rule_match"
+LABEL="not_Huawei"
 
 #	Intel
 ATTR{idVendor}=="8087", ENV{adb_user}="yes"

From 59ced1134010573da2ee3fa662d1bad5b723448b Mon Sep 17 00:00:00 2001
From: Joe Da Silva <digital@joescat.com>
Date: Thu, 21 Jan 2016 07:20:50 -0800
Subject: [PATCH 5/5] Several edits and fixes

Reduce several tests and additions.
Allow samsung probability of tablets too.
Some errors, like TI not setting env variable for a match.
---
 51-android.rules | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/51-android.rules b/51-android.rules
index 425d903..cb04f4b 100644
--- a/51-android.rules
+++ b/51-android.rules
@@ -210,8 +210,7 @@ ATTR{idVendor}=="0482", ENV{adb_user}="yes"
 #	Lab126
 ATTR{idVendor}=="1949", ENV{adb_user}="yes"
 #		Amazon Kindle Fire
-ATTR{idProduct}=="0006", SYMLINK+="android_adb"
-ATTR{idProduct}=="0006", SYMLINK+="android_fastboot"
+ATTR{idProduct}=="0006", SYMLINK+="android_adb", SYMLINK+="android_fastboot"
 
 #	Lenovo
 ATTR{idVendor}=="17ef", ENV{adb_user}="yes"
@@ -307,9 +306,7 @@ ENV{adb_user}="yes"
 #		Geeksphone Zero
 ATTR{idProduct}=="9025", SYMLINK+="android_adb"
 #		OnePlus One
-ATTR{idProduct}=="6769", SYMLINK+="android_adb"
-ATTR{idProduct}=="6764", SYMLINK+="android_adb"
-ATTR{idProduct}=="6765", SYMLINK+="android_adb"
+ATTR{idProduct}=="676?", SYMLINK+="android_adb"
 #		OnePlus Two
 ATTR{idProduct}=="9011", SYMLINK+="android_adb"
 GOTO="android_usb_rule_match"
@@ -321,9 +318,7 @@ ATTR{idVendor}=="1f53", ENV{adb_user}="yes"
 #	Samsung
 ATTR{idVendor}!="04e8", GOTO="not_Samsung"
 #		False positive printer
-ATTR{idProduct}=="3252", GOTO="android_usb_rules_end"
-#		False positive {non-phone devices}
-ATTR{idProduct}!="6???", GOTO="android_usb_rules_end"
+ATTR{idProduct}=="3???", GOTO="android_usb_rules_end"
 
 ENV{adb_user}="yes"
 #		Galaxy i5700
@@ -413,8 +408,8 @@ ATTR{idProduct}=="00f2", SYMLINK+="android_adb"
 ATTR{idVendor}=="2340", ENV{adb_user}="yes"
 
 #	Texas Instruments UsbBoot
-ATTR{idVendor}=="0451", ATTR{idProduct}=="d00f"
-ATTR{idVendor}=="0451", ATTR{idProduct}=="d010"
+ATTR{idVendor}=="0451", ATTR{idProduct}=="d00f", ENV{adb_user}="yes"
+ATTR{idVendor}=="0451", ATTR{idProduct}=="d010", ENV{adb_user}="yes"
 
 #	Toshiba
 ATTR{idVendor}=="0930", ENV{adb_user}="yes"