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

Commit 30f1312b authored by Andy McFadden's avatar Andy McFadden Committed by Android (Google) Code Review
Browse files

Merge "Use Map.Entry, not HashMap.Entry"

parents 8ffd2ccc 2f36229d

core/java/android/accounts/AccountManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import java.util.Arrays; 
import java.util.Collection;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.Map;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.concurrent.atomic.AtomicReference;
@@ -275,7 +276,7 @@ public class AccountManagerService 
                        accountNames.add(accountName);

                    }

                }

                for (HashMap.Entry<String, ArrayList<String>> cur

                for (Map.Entry<String, ArrayList<String>> cur

                        : accountNamesByType.entrySet()) {

                    final String accountType = cur.getKey();

                    final ArrayList<String> accountNames = cur.getValue();

services/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -620,11 +620,11 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        packages = new String[size];

                        components = new ArrayList[size];

                        uids = new int[size];

                        Iterator<HashMap.Entry<String, ArrayList<String>>>

                        Iterator<Map.Entry<String, ArrayList<String>>>

                                it = mPendingBroadcasts.entrySet().iterator();

                        int i = 0;

                        while (it.hasNext() && i < size) {

                            HashMap.Entry<String, ArrayList<String>> ent = it.next();

                            Map.Entry<String, ArrayList<String>> ent = it.next();

                            packages[i] = ent.getKey();

                            components[i] = ent.getValue();

                            PackageSetting ps = mSettings.mPackages.get(ent.getKey());

services/java/com/android/server/pm/Settings.java

+4 −3
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import java.util.Date; 
import java.util.HashMap;

import java.util.HashSet;

import java.util.Iterator;

import java.util.Map;



import libcore.io.IoUtils;
@@ -929,7 +930,7 @@ final class Settings { 
            }

            

            if (mRenamedPackages.size() > 0) {

                for (HashMap.Entry<String, String> e : mRenamedPackages.entrySet()) {

                for (Map.Entry<String, String> e : mRenamedPackages.entrySet()) {

                    serializer.startTag(null, "renamed-package");

                    serializer.attribute(null, "new", e.getKey());

                    serializer.attribute(null, "old", e.getValue());
@@ -2144,7 +2145,7 @@ final class Settings { 


        printedSomething = false;

        if (mRenamedPackages.size() > 0) {

            for (final HashMap.Entry<String, String> e : mRenamedPackages.entrySet()) {

            for (final Map.Entry<String, String> e : mRenamedPackages.entrySet()) {

                if (packageName != null && !packageName.equals(e.getKey())

                        && !packageName.equals(e.getValue())) {

                    continue;