Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 731bf243 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by Android (Google) Code Review
Browse files

Merge "Minor fixes"

parents 38622c30 f5bf0cb2

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

+3 −1
Original line number Diff line number Diff line
@@ -20899,8 +20899,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
    }















    public boolean isUserStopped(int userId) {













        synchronized (this) {















            return mUserController.getStartedUserStateLocked(userId) == null;















        }













    }





























    ActivityInfo getActivityInfoForUser(ActivityInfo aInfo, int userId) {















        if (aInfo == null

























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



+2
−2






























Original line number
Diff line number
Diff line








@@ -77,8 +77,8 @@ class RecentTasks extends ArrayList<TaskRecord> {













    }































    /**













     * 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















     */