Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev (9bc71c49) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/MediaSessionService.java

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -205,9 +205,8 @@ public class MediaSessionService extends SystemService implements Monitor {
	}		}

	private List<MediaSessionRecord> getActiveSessionsLocked(int userId) {		private List<MediaSessionRecord> getActiveSessionsLocked(int userId) {
	List<MediaSessionRecord> records;		List<MediaSessionRecord> records = new ArrayList<>();
	if (userId == UserHandle.USER_ALL) {		if (userId == UserHandle.USER_ALL) {
	records = new ArrayList<>();
	int size = mUserRecords.size();		int size = mUserRecords.size();
	for (int i = 0; i < size; i++) {		for (int i = 0; i < size; i++) {
	records.addAll(mUserRecords.valueAt(i).mPriorityStack.getActiveSessions(userId));		records.addAll(mUserRecords.valueAt(i).mPriorityStack.getActiveSessions(userId));
	@@ -216,9 +215,9 @@ public class MediaSessionService extends SystemService implements Monitor {
	FullUserRecord user = getFullUserRecordLocked(userId);		FullUserRecord user = getFullUserRecordLocked(userId);
	if (user == null) {		if (user == null) {
	Log.w(TAG, "getSessions failed. Unknown user " + userId);		Log.w(TAG, "getSessions failed. Unknown user " + userId);
	return new ArrayList<>();		return records;
	}		}
	records = user.mPriorityStack.getActiveSessions(userId);		records.addAll(user.mPriorityStack.getActiveSessions(userId));
	}		}

	// Return global priority session at the first whenever it's asked.		// Return global priority session at the first whenever it's asked.