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

Revert "Moved restricted profile setup logic to UserManagerService"

Browse Source 
This reverts commit 151dffcd64.

Change-Id: If98fddcfc8f46c77e3491f7a9fc918ed3752a0e8
This commit is contained in:
Bart Sears
2015-09-26 02:00:46 +00:00
parent 151dffcd64
commit fbd126e423
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/DeviceAdminAdd.java
View File

@@ -38,7 +38,6 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
import android.os.RemoteCallback;
@@ -473,7 +472,7 @@ public class DeviceAdminAdd extends Activity {
private void addDeviceAdminPolicies(boolean showDescription) {
if (!mAdminPoliciesInitialized) {
boolean isOwner = Binder.getCallingUserHandle().isOwner();
boolean isOwner = UserHandle.getCallingUserHandle().isOwner();
for (DeviceAdminInfo.PolicyInfo pi : mDeviceAdmin.getUsedPolicies()) {
int descriptionId = isOwner ? pi.description : pi.descriptionForSecondaryUsers;
int labelId = isOwner ? pi.label : pi.labelForSecondaryUsers;