commit f5bf0cb2019d25de1a514206caca3fee0f3f8bc7
author Suprabh Shukla <suprabh@google.com> Tue Jan 19 17:42:03 2016 -0800
committer Suprabh Shukla <suprabh@google.com> Wed Jan 20 15:52:05 2016 -0800
tree ec5ea6c4dc2a838ef4f834e12d2ad3e007989a41
parent 11cbea90ef90fc7687142b4d285786ac164635b3

Minor fixes

Added a synchronized block around a locked method call, updated javadoc
for a method in RecentTasks.

Change-Id: Ie58ac1d1755485902dbb453eb72a1291f9e65861

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index ca33f9f..17c1f633 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -20892,7 +20892,9 @@
     }
 
     public boolean isUserStopped(int userId) {
-        return mUserController.getStartedUserStateLocked(userId) == null;
+        synchronized (this) {
+            return mUserController.getStartedUserStateLocked(userId) == null;
+        }
     }
 
     ActivityInfo getActivityInfoForUser(ActivityInfo aInfo, int userId) {

services/core/java/com/android/server/am/RecentTasks.java

diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java
index a3c26cb..05702af 100644
--- a/services/core/java/com/android/server/am/RecentTasks.java
+++ b/services/core/java/com/android/server/am/RecentTasks.java
@@ -77,8 +77,8 @@
     }
 
     /**
-     * Loads the persistent recentTasks for {@code userId} into {@link #mRecentTasks} from
-     * persistent storage. Does nothing if they are already loaded.
+     * Loads the persistent recentTasks for {@code userId} into this list from persistent storage.
+     * Does nothing if they are already loaded.
      *
      * @param userId the user Id
      */