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

Commit 3eb0ae79 authored by Kholoud Mohamed's avatar Kholoud Mohamed
Browse files

Remove finance flag checks 

Fixes: 294552143
Test: build succeeds
Change-Id: I0cb8fa54053c30cd029920b9ed6c30361dddf339
parent bd30a5d9

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

+2 −13
Original line number Diff line number Diff line
@@ -79,14 +79,7 @@ public class DevicePolicyCacheImpl extends DevicePolicyCache { 


    @Override

    public boolean isScreenCaptureAllowed(int userHandle) {

        if (DevicePolicyManagerService.isPolicyEngineForFinanceFlagEnabled()) {

        return isScreenCaptureAllowedInPolicyEngine(userHandle);

        } else {

            synchronized (mLock) {

                return mScreenCaptureDisallowedUser != UserHandle.USER_ALL

                        && mScreenCaptureDisallowedUser != userHandle;

            }

        }

    }



    private boolean isScreenCaptureAllowedInPolicyEngine(int userHandle) {
@@ -182,11 +175,7 @@ public class DevicePolicyCacheImpl extends DevicePolicyCache { 
        synchronized (mLock) {

            pw.println("Device policy cache:");

            pw.increaseIndent();

            if (DevicePolicyManagerService.isPolicyEngineForFinanceFlagEnabled()) {

            pw.println("Screen capture disallowed users: " + mScreenCaptureDisallowedUsers);

            } else {

                pw.println("Screen capture disallowed user: " + mScreenCaptureDisallowedUser);

            }

            pw.println("Password quality: " + mPasswordQuality);

            pw.println("Permission policy: " + mPermissionPolicy);

            pw.println("Admin can grant sensors permission: " + mCanGrantSensorsPermissions.get());

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

+468 −1337

File changed.

Preview size limit exceeded, changes collapsed.