Merge lp:~sergiusens/ubuntu/saucy/android-tools/lax_udev into lp:ubuntu/saucy/android-tools

Proposed by Sergio Schvezov
Status: Merged
Merged at revision: 20
Proposed branch: lp:~sergiusens/ubuntu/saucy/android-tools/lax_udev
Merge into: lp:ubuntu/saucy/android-tools
Diff against target: 73 lines (+54/-5)
2 files modified
debian/android-tools-adb.udev (+47/-5)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~sergiusens/ubuntu/saucy/android-tools/lax_udev
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+177661@code.launchpad.net

Description of the change

Adding an entry for all the usb configurations that enable adb

i.e.;
on property:sys.usb.config=accessory,audio_source
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/idVendor 18d1
    write /sys/class/android_usb/android0/idProduct 2d04
...

on property:sys.usb.config=accessory,audio_source,adb
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/idVendor 18d1
    write /sys/class/android_usb/android0/idProduct 2d05
...

manta specific:
on property:sys.usb.config=rndis
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/idVendor 18d1
    write /sys/class/android_usb/android0/idProduct 4ee3
...

on property:sys.usb.config=rndis,adb
    write /sys/class/android_usb/android0/enable 0
    write /sys/class/android_usb/android0/idVendor 18d1
    write /sys/class/android_usb/android0/idProduct 4ee4

To post a comment you must log in.
21. By Sergio Schvezov

debian/android-tools-adb.udev: Adding rules for all usb configs that
enable adb.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/android-tools-adb.udev'
2--- debian/android-tools-adb.udev 2013-05-08 13:03:06 +0000
3+++ debian/android-tools-adb.udev 2013-07-30 21:25:36 +0000
4@@ -1,7 +1,49 @@
5 # Udev rules for letting the console user access adb.
6-# d001 recovery
7-# d002 system
8-
9-ACTION=="add|change", SUBSYSTEM=="usb", \
10- ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="d001|d002", \
11+# Vendor ids
12+# Important product ids
13+# d001 adb recovery
14+# d002 adb system
15+
16+# Applies to 18d1
17+# 2d00 accessory
18+# 2d01 accessory,adb
19+# 2d02 audio_source (part of libgphoto2-2)
20+# 2d03 audio_source,adb
21+# 2d04 accessory,audio_source
22+# 2d05 accessory,audio_source,adb
23+# 4ee1 mtp (part of libmtp-common)
24+# 4ee2 mtp,adb (part of libmtp-common)
25+# 4ee3 rndis
26+# 4ee4 adb,rdnis
27+# 4ee5 ptp
28+# 4ee6 ptp,adb
29+# 4e41 mtp
30+# 4e42 mtp,adb
31+# 4e43 ptp
32+# 4e44 ptp,adb
33+# 4e23 rndis
34+# 4e24 rndis,adb
35+
36+ACTION=="add|change", SUBSYSTEM=="usb", \
37+ ATTRS{idVendor}=="18d1", \
38+ ATTRS{idProduct}=="2d01|2d03|2d05|4ee2|4ee4|4ee6|4e42|4e44|4e24|d001|d002"
39+ TAG+="uaccess"
40+
41+# Applies to 04e8
42+# 685b mass_storage
43+# 685e mass_storage,adb
44+# 685c mtp (libgphoto2-2 libmtp-common)
45+# 6860 mtp,adb (part of libgphoto2-2 libmtp-common)
46+# 6862 rndis,dm
47+# 6863 rndis
48+# 6864 rndis,adb & rndis,acm,dm
49+# 6865 ptp
50+# 6866 ptp,adb
51+# 6864 rndis,dm
52+# 6865 ptp
53+# 6866 ptp,adb
54+
55+ACTION=="add|change", SUBSYSTEM=="usb", \
56+ ATTRS{idVendor}=="04e8", \
57+ ATTRS{idProduct}=="685e|6860|6864|6866|6866"
58 TAG+="uaccess"
59
60=== modified file 'debian/changelog'
61--- debian/changelog 2013-07-04 18:49:18 +0000
62+++ debian/changelog 2013-07-30 21:25:36 +0000
63@@ -1,3 +1,10 @@
64+android-tools (4.2.2+git20130218-3ubuntu14) UNRELEASED; urgency=low
65+
66+ * debian/android-tools-adb.udev: Adding rules for all usb configs that
67+ enable adb.
68+
69+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Tue, 30 Jul 2013 15:08:43 -0300
70+
71 android-tools (4.2.2+git20130218-3ubuntu13) saucy; urgency=low
72
73 * debian/control: android-tools-adbd should depend on libhybris-utils to use

Subscribers

People subscribed via source and target branches