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

Commit 288a94d7 authored by felipeal's avatar felipeal Committed by Felipe Leme
Browse files

Final fixes on UserManager.getUsers() refactoring. 

Test: m
Fixes: 157921703
Bug: 162888972

Change-Id: I91df9d560719976a35ba5c1c7cef54319ecfe381
Exempt-From-Owner-Approval: just changed TODO comments
parent 026c5e70

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

+1 −1
Original line number Diff line number Diff line
@@ -6222,7 +6222,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
@@ -760,8 +760,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);