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

Commit b223006c authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '1919-s-parental' into 'v2.2-s' 

base: allow parental control to be activated with accounts

See merge request e/os/android_frameworks_base!211
parents d835ef89 03409f56

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

+4 −0
Original line number Diff line number Diff line
@@ -15284,6 +15284,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        if (!isAdb(caller)) {

            return true;

        }

        // Allow parental control with accounts

        if (owner != null && "foundation.e.parentalcontrol".equals(owner.getPackageName())) {

            return false;

        }

        wtfIfInLock();















        return mInjector.binderWithCleanCallingIdentity(() -> {