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

Commit fbc1309a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix for crash due to ConcurrentModificationException in... 

Merge "Fix for crash due to ConcurrentModificationException in PrintRecommendationService" into main
parents 9d0b9cde 5f9c6641

packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/hp/ServiceListener.java

+1 −2
Original line number Diff line number Diff line
@@ -130,8 +130,7 @@ public class ServiceListener implements ServiceResolveQueue.ResolveCallback { 
        boolean wasRemoved = false;



        synchronized (mLock) {

            Set<String> vendors = mVendorHashMap.keySet();

            for (String vendor : vendors) {

            for(String vendor : new ArrayList<>(mVendorHashMap.keySet())) {

                PrinterHashMap map = mVendorHashMap.get(vendor);

                wasRemoved |= (map.removePrinter(nsdServiceInfo) != null);

                if (map.isEmpty()) wasRemoved |= (mVendorHashMap.remove(vendor) != null);