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

Commit 1cf97d99 authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Final fixes on UserManager.getUsers() refactoring."

parents 230128c0 288a94d7

services/core/java/com/android/server/appop/AppOpsService.java

+1 −1
Original line number Diff line number Diff line
@@ -6247,7 +6247,7 @@ public class AppOpsService extends IAppOpsService.Stub { 


            int[] users;

            if (userId == UserHandle.USER_ALL) {

                // TODO(b/157921703): this call is returning all users, not just live ones - we

                // TODO(b/162888972): this call is returning all users, not just live ones - we

                // need to either fix the method called, or rename the variable

                List<UserInfo> liveUsers = UserManager.get(mContext).getUsers();

services/core/java/com/android/server/pm/UserManagerService.java

+0 −2
Original line number Diff line number Diff line
@@ -765,8 +765,6 @@ public class UserManagerService extends IUserManager.Stub { 
        return null;

    }



    // TODO(b/157921703): replace by getAliveUsers() or remove (so callers

    // explicitly call the 3-booleans version)

    public @NonNull List<UserInfo> getUsers(boolean excludeDying) {

        return getUsers(/*excludePartial= */ true, excludeDying, /* excludePreCreated= */

                true);