Merge "Remove finance flag checks" into main (4c048e78) · Commits · e / os / android_frameworks_base

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());

+468 −1337

File changed.

Preview size limit exceeded, changes collapsed.