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

Commit e1ce22a9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Combine the checks for DO/PO in isAdminAffectedByRestriction()." into... 

Merge "Combine the checks for DO/PO in isAdminAffectedByRestriction()." into udc-dev am: 5bbe99a2 am: 7477129b

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



Change-Id: I8e2200c34f51dfd98badeb3bf6c92a551d041697
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 578254e8 7477129b

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

+1 −2
Original line number Diff line number Diff line
@@ -12574,9 +12574,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            case UserManager.RESTRICTION_NOT_SET:

                return false;

            case UserManager.RESTRICTION_SOURCE_DEVICE_OWNER:

                return !isDeviceOwner(admin, userId);

            case UserManager.RESTRICTION_SOURCE_PROFILE_OWNER:

                return !isProfileOwner(admin, userId);

                return !(isDeviceOwner(admin, userId) || isProfileOwner(admin, userId));

            default:

                return true;

        }