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

Commit 5f0e8122 authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev

am: 68c263cf

Change-Id: I091c7a1173b468c9887d247efa517696cbd50da2
parents 6a9133f5 68c263cf
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ import android.view.animation.AnimationUtils;
import android.widget.ListView;
import android.widget.TabWidget;
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.UserIcons;

import java.io.IOException;
@@ -1028,13 +1029,14 @@ public final class Utils extends com.android.settingslib.Utils {
     * @throws SecurityException if the given userId does not belong to the current user group.
     */
    public static int enforceSameOwner(Context context, int userId) {
        UserManager um = getUserManager(context);
        if (!um.getUserProfiles().contains(new UserHandle(userId))) {
        final UserManager um = getUserManager(context);
        final int[] profileIds = um.getProfileIdsWithDisabled(UserHandle.myUserId());
        if (ArrayUtils.contains(profileIds, userId)) {
            return userId;
        }
        throw new SecurityException("Given user id " + userId + " does not belong to user "
                + UserHandle.myUserId());
    }
        return userId;
    }

    /**
     * Returns the effective credential owner of the calling user.