commit da74a153132420635fc6b7f4005d2fbb5c42fd64
author Jaewan Kim <jaewan@google.com> Tue Oct 03 23:58:11 2017 +0900
committer Jaewan Kim <jaewan@google.com> Wed Oct 04 00:11:55 2017 +0900
tree e1e5bb80a561004a0ea0dbf49246dafada11308a
parent 9cb14a0c95a17f683085a07c949530e03cbb1887

MediaSessionService: Prevent getActiveSessions() from growing infinitely

Bug: 67358262
Change-Id: I1c25a456ff4f2b16fee3098ac8f14d2899fb1ca5
Test: Run CtsMediaHostTest

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

diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index b9a2d18..b102dde 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -205,9 +205,8 @@
     }
 
     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 @@
             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.