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

Commit 1ef31644 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Added getProfileIds method returning array of userIds" into nyc-dev

parents 3cd935c8 4a4af5ae

src/com/android/settings/CredentialStorage.java

+2 −3
Original line number Diff line number Diff line
@@ -344,13 +344,12 @@ public final class CredentialStorage extends Activity { 


            // Clear all the users credentials could have been installed in for this user.

            final UserManager um = (UserManager) getSystemService(USER_SERVICE);

            for (UserInfo pi : um.getProfiles(UserHandle.getUserId(Process.myUid()))) {

            for (int userId : um.getProfileIdsWithDisabled(UserHandle.myUserId())) {

                for (int uid : SYSTEM_CREDENTIAL_UIDS) {

                    mKeyStore.clearUid(UserHandle.getUid(pi.id, uid));

                    mKeyStore.clearUid(UserHandle.getUid(userId, uid));

                }

            }





            try {

                KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this);

                try {

src/com/android/settings/Utils.java

+4 −6
Original line number Diff line number Diff line
@@ -615,12 +615,10 @@ public final class Utils extends com.android.settingslib.Utils { 
     * @return the managed profile id or UserHandle.USER_NULL if there is none.

     */

    public static int getManagedProfileId(UserManager um, int parentUserId) {

        List<UserInfo> profiles = um.getProfiles(parentUserId);

        int numProfiles = profiles.size();

        for (int i = 0; i < numProfiles; ++i) {

            UserInfo profile = profiles.get(i);

            if (profile.id != parentUserId) {

                return profile.id;

        int[] profileIds = um.getProfileIdsWithDisabled(parentUserId);

        for (int profileId : profileIds) {

            if (profileId != parentUserId) {

                return profileId;

            }

        }

        return UserHandle.USER_NULL;