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

Commit ef88b07e authored by Robert Wu's avatar Robert Wu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18739803



Change-Id: Ie912792ab5d23f019a68b3e704bf3ec9f3f1a82a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21be7e85 5ccdd5c1

services/usb/java/com/android/server/usb/UsbHostManager.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -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;