Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-10 05:44:55 +00:00
committed by Android (Google) Code Review
parent 64b23cca4d da74a15313
commit 9bc71c4922
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/media/MediaSessionService.java
View File

@@ -205,9 +205,8 @@ public class MediaSessionService extends SystemService implements Monitor {
}
private List<MediaSessionRecord> getActiveSessionsLocked(int userId) {
List<MediaSessionRecord> records;
List<MediaSessionRecord> records = new ArrayList<>();
if (userId == UserHandle.USER_ALL) {
records = new ArrayList<>();
int size = mUserRecords.size();
for (int i = 0; i < size; i++) {
records.addAll(mUserRecords.valueAt(i).mPriorityStack.getActiveSessions(userId));
@@ -216,9 +215,9 @@ public class MediaSessionService extends SystemService implements Monitor {
FullUserRecord user = getFullUserRecordLocked(userId);
if (user == null) {
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.