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

Commit 9a4e52fa authored by Jing Ji's avatar Jing Ji Committed by Android Build Coastguard Worker
Browse files

Use ArrayMap instead of SparseArray to manage the ProviderKey 

As the ArrayMap handles the hash code collision properly.

Bug: 197647956
Test: atest CtsContentTestCases:android.content.cts
Change-Id: Ibb57a22c08b0fa5462505d586d5fb0aaf908c80f
(cherry picked from commit 119dd01b)
parent d4fcdd28

core/java/android/app/ActivityThread.java

+4 −8
Original line number Diff line number Diff line
@@ -464,11 +464,7 @@ public final class ActivityThread extends ClientTransactionHandler 


        @Override

        public int hashCode() {

            return hashCode(authority, userId);

        }



        public static int hashCode(final String auth, final int userIdent) {

            return ((auth != null) ? auth.hashCode() : 0) ^ userIdent;

            return ((authority != null) ? authority.hashCode() : 0) ^ userId;

        }

    }
@@ -490,7 +486,7 @@ public final class ActivityThread extends ClientTransactionHandler 
    // Note we never removes items from this map but that's okay because there are only so many

    // users and so many authorities.

    @GuardedBy("mGetProviderKeys")

    final SparseArray<ProviderKey> mGetProviderKeys = new SparseArray<>();

    final ArrayMap<ProviderKey, ProviderKey> mGetProviderKeys = new ArrayMap<>();



    final ArrayMap<Activity, ArrayList<OnActivityPausedListener>> mOnPauseListeners

        = new ArrayMap<Activity, ArrayList<OnActivityPausedListener>>();
@@ -7015,11 +7011,11 @@ public final class ActivityThread extends ClientTransactionHandler 
    }



    private ProviderKey getGetProviderKey(String auth, int userId) {

        final int key = ProviderKey.hashCode(auth, userId);

        final ProviderKey key = new ProviderKey(auth, userId);

        synchronized (mGetProviderKeys) {

            ProviderKey lock = mGetProviderKeys.get(key);

            if (lock == null) {

                lock = new ProviderKey(auth, userId);

                lock = key;

                mGetProviderKeys.put(key, lock);

            }

            return lock;