Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "USB MIDI: Reset counter after unique codes full" into tm-dev

Browse Source
This commit is contained in:
Robert Wu
2022-06-06 17:05:22 +00:00
committed by Android (Google) Code Review
parent 7a1dd2e61c 186b9e447b
commit 5ccdd5c1eb
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/usb/java/com/android/server/usb/UsbHostManager.java
View File

@@ -102,6 +102,7 @@ public class UsbHostManager {
private final HashMap<String, ArrayList<UsbDirectMidiDevice>> private final HashMap<String, ArrayList<UsbDirectMidiDevice>>
mMidiDevices = new HashMap<String, ArrayList<UsbDirectMidiDevice>>(); mMidiDevices = new HashMap<String, ArrayList<UsbDirectMidiDevice>>();
private final HashSet<String> mMidiUniqueCodes = new HashSet<String>(); private final HashSet<String> mMidiUniqueCodes = new HashSet<String>();
private static final int MAX_UNIQUE_CODE_GENERATION_ATTEMPTS = 10;
private final Random mRandom = new Random(); private final Random mRandom = new Random();
private final boolean mHasMidiFeature; private final boolean mHasMidiFeature;
@@ -645,11 +646,18 @@ public class UsbHostManager {
// Generate a 3 digit code. // Generate a 3 digit code.
private String generateNewUsbDeviceIdentifier() { private String generateNewUsbDeviceIdentifier() {
String code; String code;
int numberOfAttempts = 0;
do { do {
if (numberOfAttempts > MAX_UNIQUE_CODE_GENERATION_ATTEMPTS) {
Slog.w(TAG, "MIDI unique code array resetting");
mMidiUniqueCodes.clear();
numberOfAttempts = 0;
}
code = ""; code = "";
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
code += mRandom.nextInt(10); code += mRandom.nextInt(10);
} }
numberOfAttempts++;
} while (mMidiUniqueCodes.contains(code)); } while (mMidiUniqueCodes.contains(code));
mMidiUniqueCodes.add(code); mMidiUniqueCodes.add(code);
return code; return code;