commit c4a0b34248eebcd3061eae0c544082c30a2a63e0
author Andrew Solovay <asolovay@google.com> Tue Oct 10 16:29:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 10 16:29:06 2017 +0000
tree 51cea6209ee10560d2597e031b1dc1811710d9b5
parent 9bc71c492230a10ffba73dc47a188dd0d5ce834b
parent ab8ea9ff01cf728f2fdb43506d64e6d0dde65d71

Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev

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.