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

Commit 90088bb8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "No need for getProfileOwnerForUser as SystemApi"

parents c384395d 477666d9

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -665,7 +665,6 @@ package android.app.admin { 
    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public java.util.List<java.lang.String> getPermittedAccessibilityServices(int);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();

    method @Nullable public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException;

    method @Nullable @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS, conditional=true) public android.content.ComponentName getProfileOwnerAsUser(@NonNull android.os.UserHandle);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException;

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public int getUserProvisioningState();

    method public boolean isDeviceManaged();

core/java/android/app/admin/DevicePolicyManager.java

+0 −1
Original line number Diff line number Diff line
@@ -6348,7 +6348,6 @@ public class DevicePolicyManager { 
     */

    @RequiresPermission(value = android.Manifest.permission.INTERACT_ACROSS_USERS,

            conditional = true)

    @SystemApi

    public @Nullable ComponentName getProfileOwnerAsUser(@NonNull UserHandle user) {

        if (mService != null) {

            try {

packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java

+11 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.admin.DevicePolicyManager; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;
@@ -47,7 +48,16 @@ public class RestrictedLockUtils { 
        if (dpm == null) {

            return null;

        }

        ComponentName adminComponent = dpm.getProfileOwnerAsUser(user);



        Context userContext;

        try {

            userContext = context.createPackageContextAsUser(context.getPackageName(), 0, user);

        } catch (PackageManager.NameNotFoundException e) {

            throw new IllegalStateException(e);

        }



        ComponentName adminComponent = userContext.getSystemService(

                DevicePolicyManager.class).getProfileOwner();

        if (adminComponent != null) {

            return new EnforcedAdmin(adminComponent, enforcedRestriction, user);

        }