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

Commit 558ff9d3 authored Nov 17, 2017 by Paul McLean

Fixed class and subclass IDs sign extension on byte->int problem.

Devices - Skylab, Mir, HTC dongle, Presonus AudioBox 44VSL, HP mouse
Hard coded class ID of 0xFF and subclass 0xFD to match b/68944518 symptoms.

Bug: 68944518

Test: Manual - see above

Change-Id: I7330c57b15278158a2eb449f0463b91244a3e176

parent e6e6f2d6

services/usb/java/com/android/server/usb/descriptors/Usb10ACHeader.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ public final class Usb10ACHeader extends UsbACHeaderInterface {
		// numbers associate with this endpoint
		private byte mControls; // Vers 2.0 thing

		public Usb10ACHeader(int length, byte type, byte subtype, byte subclass, int spec) {
		public Usb10ACHeader(int length, byte type, byte subtype, int subclass, int spec) {
		super(length, type, subtype, subclass, spec);
		}

services/usb/java/com/android/server/usb/descriptors/Usb10ACInputTerminal.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ public final class Usb10ACInputTerminal extends UsbACTerminal {
		private byte mChannelNames; // 10:1 Unused (0x00)
		private byte mTerminal; // 11:1 Unused (0x00)

		public Usb10ACInputTerminal(int length, byte type, byte subtype, byte subclass) {
		public Usb10ACInputTerminal(int length, byte type, byte subtype, int subclass) {
		super(length, type, subtype, subclass);
		}

services/usb/java/com/android/server/usb/descriptors/Usb10ACMixerUnit.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ public final class Usb10ACMixerUnit extends UsbACMixerUnit {
		private byte[] mControls; // bitmasks of which controls are present for each channel
		private byte mNameID; // string descriptor ID of mixer name

		public Usb10ACMixerUnit(int length, byte type, byte subtype, byte subClass) {
		public Usb10ACMixerUnit(int length, byte type, byte subtype, int subClass) {
		super(length, type, subtype, subClass);
		}

services/usb/java/com/android/server/usb/descriptors/Usb10ACOutputTerminal.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ public final class Usb10ACOutputTerminal extends UsbACTerminal {
		private byte mSourceID; // 7:1 From Input Terminal. (0x01)
		private byte mTerminal; // 8:1 Unused.

		public Usb10ACOutputTerminal(int length, byte type, byte subtype, byte subClass) {
		public Usb10ACOutputTerminal(int length, byte type, byte subtype, int subClass) {
		super(length, type, subtype, subClass);
		}

services/usb/java/com/android/server/usb/descriptors/Usb10ASFormatI.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ public final class Usb10ASFormatI extends UsbASFormat {
		// min & max rates otherwise mSamFreqType rates.
		// All 3-byte values. All rates in Hz

		public Usb10ASFormatI(int length, byte type, byte subtype, byte formatType, byte subclass) {
		public Usb10ASFormatI(int length, byte type, byte subtype, byte formatType, int subclass) {
		super(length, type, subtype, formatType, subclass);
		}