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

Moved restricted profile setup logic to UserManagerService

Browse Source 
Bug: 24212155
Change-Id: Iea214877dd856e830a42467780b7407b8991c52d
This commit is contained in:
Fyodor Kupolov
2015-09-18 18:22:24 -07:00
parent 39090f1cba
commit 1f432586b3
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ 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;
@@ -472,7 +473,7 @@ public class DeviceAdminAdd extends Activity {
private void addDeviceAdminPolicies(boolean showDescription) {
if (!mAdminPoliciesInitialized) {
boolean isOwner = UserHandle.getCallingUserHandle().isOwner();
boolean isOwner = Binder.getCallingUserHandle().isOwner();
for (DeviceAdminInfo.PolicyInfo pi : mDeviceAdmin.getUsedPolicies()) {
int descriptionId = isOwner ? pi.description : pi.descriptionForSecondaryUsers;
int labelId = isOwner ? pi.label : pi.labelForSecondaryUsers;