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

Commit 1bf2b00e authored by Wentao Wang's avatar Wentao Wang Committed by Automerger Merge Worker
Browse files

Merge "Expose getDeviceOwnerComponent to SystemServer." into udc-qpr-dev am:... 

Merge "Expose getDeviceOwnerComponent to SystemServer." into udc-qpr-dev am: 935ae578 am: bb4ae983

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23729071



Change-Id: I02e412375b0741a6038ad2aac6f28335eb5c46b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b98016b bb4ae983

core/java/android/app/admin/DevicePolicyManagerInternal.java

+10 −0
Original line number Diff line number Diff line
@@ -249,6 +249,16 @@ public abstract class DevicePolicyManagerInternal { 
    @Nullable

    public abstract ComponentName getProfileOwnerAsUser(@UserIdInt int userId);



    /**

     * Returns the device owner component for the device, or {@code null} if there is not one.

     *

     * @deprecated added temporarily to support Android Role permission granting.

     * Please contact Android Enterprise Device Policy team before calling this function.

     */

    @Deprecated

    @Nullable

    public abstract ComponentName getDeviceOwnerComponent(boolean callingUserOnly);



    /**

     * Returns the user id of the device owner, or {@link UserHandle#USER_NULL} if there is not one.

     */

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -16225,6 +16225,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            return DevicePolicyManagerService.this.getProfileOwnerAsUser(userId);

        }













        @Override













        public ComponentName getDeviceOwnerComponent(boolean callingUserOnly) {













            return DevicePolicyManagerService.this.getDeviceOwnerComponent(callingUserOnly);













        }



























        @Override















        public int getDeviceOwnerUserId() {















            return DevicePolicyManagerService.this.getDeviceOwnerUserId();