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

Commit ca6e62a7 authored by Salud Lemus's avatar Salud Lemus Committed by Automerger Merge Worker
Browse files

Merge "Update canSilentlyInstallPackage DPMS API for financed device owner"... 

Merge "Update canSilentlyInstallPackage DPMS API for financed device owner" into tm-dev am: 7977353c am: 67dd02d5

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



Change-Id: I9dadd07f7651254143d5c1152c668c6f4ca8401a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22152319 67dd02d5

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

+3 −1
Original line number Diff line number Diff line
@@ -13056,9 +13056,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            if (callerPackage == null) {

                return false;

            }













            CallerIdentity caller = new CallerIdentity(callerUid, null, null);















            if (isUserAffiliatedWithDevice(UserHandle.getUserId(callerUid))















                    && (isActiveProfileOwner(callerUid)













                        || isActiveDeviceOwner(callerUid))) {













                        || isDefaultDeviceOwner(caller) || isFinancedDeviceOwner(caller))) {















                // device owner or a profile owner affiliated with the device owner















                return true;















            }