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

Commit 854ded13 authored by tadvana's avatar tadvana Committed by Automerger Merge Worker
Browse files

AdapterService ConcurrentModificationException fix am: de324498 am: bd632b15 am: 17258bbc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18590413



Change-Id: Ia02f8d74873fd956c67ce25e3697eedfd7cf6a40
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 490ab120 17258bbc

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+8 −8
Original line number Diff line number Diff line
@@ -148,13 +148,14 @@ import java.time.Duration; 
import java.util.ArrayDeque;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.HashMap;

import java.util.HashSet;

import java.util.Iterator;

import java.util.List;

import java.util.Map;

import java.util.Set;

import java.util.UUID;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ConcurrentLinkedQueue;

import java.util.concurrent.Executor;

import java.util.function.Predicate;
@@ -282,8 +283,7 @@ public class AdapterService extends Service { 
    private boolean mQuietmode = false;

    private HashMap<String, CallerInfo> mBondAttemptCallerInfo = new HashMap<>();



    private final Map<UUID, RfcommListenerData> mBluetoothServerSockets =

            Collections.synchronizedMap(new HashMap<>());

    private final Map<UUID, RfcommListenerData> mBluetoothServerSockets = new ConcurrentHashMap<>();

    private final Executor mSocketServersExecutor = r -> new Thread(r).start();



    private AlarmManager mAlarmManager;
@@ -1491,11 +1491,11 @@ public class AdapterService extends Service { 
    }



    private void stopRfcommServerSockets() {

        synchronized (mBluetoothServerSockets) {

            mBluetoothServerSockets.forEach((key, value) -> {

                mBluetoothServerSockets.remove(key);

                value.closeServerAndPendingSockets(mHandler);

            });

        Iterator<Map.Entry<UUID, RfcommListenerData>> socketsIterator =

                mBluetoothServerSockets.entrySet().iterator();

        while (socketsIterator.hasNext()) {

            socketsIterator.next().getValue().closeServerAndPendingSockets(mHandler);

            socketsIterator.remove();

        }

    }