From 9086ca3e9c307d43aa4d9130056442fa484eef2c Mon Sep 17 00:00:00 2001
From: Joe <digital@joescat.com>
Date: Tue, 22 Aug 2023 23:34:07 -0700
Subject: [PATCH] chore: use more specific adb GOTOs for Oppo and OnePlus
 (#272)

Also scraped some further idProducts from libmtp and gentoo.
Also scraped some idProducts from linux-usb.org
---
 51-android.rules | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/51-android.rules b/51-android.rules
index 4adc19c..50bcf40 100644
--- a/51-android.rules
+++ b/51-android.rules
@@ -341,6 +341,8 @@ LABEL="not_Intel"
 
 # IUNI
 ATTR{idVendor}!="271d", GOTO="not_IUNI"
+#   Gionee (3f11=mass,adb)
+ATTR{idProduct}=="3f11", GOTO="adbmass"
 #   U3
 ATTR{idProduct}=="bf39", GOTO="adb"
 GOTO="android_usb_rules_end"
@@ -518,16 +520,20 @@ ATTR{idVendor}=="2833", GOTO="user"
 
 # OnePlus(Oreo)
 ATTR{idVendor}!="2a70", GOTO="not_OnePlus"
+#   Oneplus 3T/5T/6 (4ee7=charge,adb)
 #   OnePlus 6, 4ee1=charging, 4ee2=MTP+debug, 4ee6=PTP+debug, 4ee7=charging+debug
-ATTR{idProduct}=="4ee2", GOTO="adb"
-ATTR{idProduct}=="4ee6", GOTO="adb"
+ATTR{idProduct}=="4ee2", GOTO="adbmtp"
+ATTR{idProduct}=="4ee6", GOTO="adbptp"
 ATTR{idProduct}=="4ee7", GOTO="adb"
 #   OnePlus Nord N10 4G USB tethering mode
 ATTR{idProduct}=="9024", GOTO="adb"
-#   OnePlus 3T with Oreo MIDI mode 90bb=adb+midi, 9011=MTP, 904e=PTP
-ATTR{idProduct}=="90bb", GOTO="adb"
-ATTR{idProduct}=="9011", SYMLINK+="android_adb"
-ATTR{idProduct}=="904e", SYMLINK+="android_adb"
+#   OnePlus 3T with Oreo MIDI mode 90bb=midi,adb 9011=mtp 904d=ptp 904e=ptp,adb
+#   OnePlus 7t (9012=mtp,adb)
+ATTR{idProduct}=="9011", GOTO="mtp"
+ATTR{idProduct}=="9012", GOTO="adbmtp"
+ATTR{idProduct}=="904d", GOTO="ptp"
+ATTR{idProduct}=="904e", GOTO="adbptp"
+ATTR{idProduct}=="90bb", GOTO="adbmidi"
 GOTO="android_usb_rule_match"
 LABEL="not_OnePlus"
 
@@ -546,9 +552,11 @@ ATTR{idProduct}=="2024", GOTO="user"
 ATTR{idProduct}=="200e", GOTO="user"
 ATTR{idProduct}=="2028", GOTO="user"
 ATTR{idProduct}=="2026", GOTO="user"
-#   OnePlus 8T (22d9:2771=adb,PTP, 22d9:2772=adb,MTP)
-ATTR{idProduct}=="2771", GOTO="adb"
-ATTR{idProduct}=="2772", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1"
+#   OnePlus 7a (2774=mass,adb)
+#   OnePlus 8T (2771=adb,ptp 2772=adb,mtp)
+ATTR{idProduct}=="2771", GOTO="adbptp"
+ATTR{idProduct}=="2772", GOTO="adbmtp"
+ATTR{idProduct}=="2774", GOTO="adbmass"
 GOTO="android_usb_rule_match"
 LABEL="not_Oppo"
 
@@ -593,8 +601,8 @@ LABEL="not_Polar"
 ATTR{idVendor}!="05c6", GOTO="not_Qualcomm"
 #   Geeksphone Zero
 ATTR{idProduct}=="9025", SYMLINK+="android_adb"
-#   OnePlus One
-ATTR{idProduct}=="676?", SYMLINK+="android_adb"
+#   OnePlus One (6765=mtp,adb, 6764=mtp)
+ATTR{idProduct}=="6765", GOTO="adbmtp"
 #   OnePlus Two
 ATTR{idProduct}=="9011", SYMLINK+="android_adb"
 #   OnePlus 3