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

Commit f2e7b3f5 authored by Alexandra Gherghina's avatar Alexandra Gherghina
Browse files

Revert "Temporarily switch off returning only enabled profiles to support dogfooding" 

This reverts commit 199c35a21ea9bddde80fdb435ec604f729b0cbe7 because client code has been updated.

Bug: 14132551
Change-Id: I7159087dfaded6f2bfe90ef103f74b242acb166c
parent 92d6aea8

core/java/android/os/UserManager.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -492,8 +492,7 @@ public class UserManager { 
        ArrayList<UserHandle> profiles = new ArrayList<UserHandle>();

        ArrayList<UserHandle> profiles = new ArrayList<UserHandle>();

        List<UserInfo> users = new ArrayList<UserInfo>();

        List<UserInfo> users = new ArrayList<UserInfo>();

        try {

        try {

            // TODO: Switch enabledOnly to true once client apps are updated

            users = mService.getProfiles(UserHandle.myUserId(), true /* enabledOnly */);

            users = mService.getProfiles(UserHandle.myUserId(), false /* enabledOnly */);

        } catch (RemoteException re) {

        } catch (RemoteException re) {

            Log.w(TAG, "Could not get user list", re);

            Log.w(TAG, "Could not get user list", re);

            return null;

            return null;