PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 263b210c16

Change-Id: I9e606761dc2c3e88832aeac2e8ddd65f0c7677f7
This commit is contained in:
Ricky Wai
2016-06-08 14:54:14 +00:00
committed by android-build-merger
parent 3e3d09eb66 263b210c16
commit acb66824a6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/Utils.java
View File

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