Merge "Use ArrayMap instead of SparseArray to manage the ProviderKey" into sc-dev am: d5ea86eaf0 (9fd02e1b) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+4 −8

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

	@Override		@Override
	public int hashCode() {		public int hashCode() {
	return hashCode(authority, userId);		return ((authority != null) ? authority.hashCode() : 0) ^ userId;
	}

	public static int hashCode(final String auth, final int userIdent) {
	return ((auth != null) ? auth.hashCode() : 0) ^ userIdent;
	}		}
	}		}

	@@ -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		// Note we never removes items from this map but that's okay because there are only so many
	// users and so many authorities.		// users and so many authorities.
	@GuardedBy("mGetProviderKeys")		@GuardedBy("mGetProviderKeys")
	final SparseArray<ProviderKey> mGetProviderKeys = new SparseArray<>();		final ArrayMap<ProviderKey, ProviderKey> mGetProviderKeys = new ArrayMap<>();

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

	private ProviderKey getGetProviderKey(String auth, int userId) {		private ProviderKey getGetProviderKey(String auth, int userId) {
	final int key = ProviderKey.hashCode(auth, userId);		final ProviderKey key = new ProviderKey(auth, userId);
	synchronized (mGetProviderKeys) {		synchronized (mGetProviderKeys) {
	ProviderKey lock = mGetProviderKeys.get(key);		ProviderKey lock = mGetProviderKeys.get(key);
	if (lock == null) {		if (lock == null) {
	lock = new ProviderKey(auth, userId);		lock = key;
	mGetProviderKeys.put(key, lock);		mGetProviderKeys.put(key, lock);
	}		}
	return lock;		return lock;