Merge "Turn off policy size tracking changes" into main (aefb1d85) · Commits · e / os / android_frameworks_base

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

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -225,7 +225,7 @@ final class DevicePolicyEngine {

	synchronized (mLock) {		synchronized (mLock) {
	PolicyState<V> localPolicyState = getLocalPolicyStateLocked(policyDefinition, userId);		PolicyState<V> localPolicyState = getLocalPolicyStateLocked(policyDefinition, userId);
	if (devicePolicySizeTrackingEnabled()) {		if (devicePolicySizeTrackingEnabled() && false) {
	if (!handleAdminPolicySizeLimit(localPolicyState, enforcingAdmin, value,		if (!handleAdminPolicySizeLimit(localPolicyState, enforcingAdmin, value,
	policyDefinition, userId)) {		policyDefinition, userId)) {
	return;		return;
	@@ -350,7 +350,7 @@ final class DevicePolicyEngine {
	}		}
	PolicyState<V> localPolicyState = getLocalPolicyStateLocked(policyDefinition, userId);		PolicyState<V> localPolicyState = getLocalPolicyStateLocked(policyDefinition, userId);

	if (devicePolicySizeTrackingEnabled()) {		if (devicePolicySizeTrackingEnabled() && false) {
	decreasePolicySizeForAdmin(localPolicyState, enforcingAdmin);		decreasePolicySizeForAdmin(localPolicyState, enforcingAdmin);
	}		}

	@@ -496,7 +496,7 @@ final class DevicePolicyEngine {

	synchronized (mLock) {		synchronized (mLock) {
	PolicyState<V> globalPolicyState = getGlobalPolicyStateLocked(policyDefinition);		PolicyState<V> globalPolicyState = getGlobalPolicyStateLocked(policyDefinition);
	if (devicePolicySizeTrackingEnabled()) {		if (devicePolicySizeTrackingEnabled() && false) {
	if (!handleAdminPolicySizeLimit(globalPolicyState, enforcingAdmin, value,		if (!handleAdminPolicySizeLimit(globalPolicyState, enforcingAdmin, value,
	policyDefinition, UserHandle.USER_ALL)) {		policyDefinition, UserHandle.USER_ALL)) {
	return;		return;
	@@ -568,7 +568,7 @@ final class DevicePolicyEngine {
	synchronized (mLock) {		synchronized (mLock) {
	PolicyState<V> policyState = getGlobalPolicyStateLocked(policyDefinition);		PolicyState<V> policyState = getGlobalPolicyStateLocked(policyDefinition);

	if (devicePolicySizeTrackingEnabled()) {		if (devicePolicySizeTrackingEnabled() && false) {
	decreasePolicySizeForAdmin(policyState, enforcingAdmin);		decreasePolicySizeForAdmin(policyState, enforcingAdmin);
	}		}

	@@ -1892,7 +1892,7 @@ final class DevicePolicyEngine {

	private void writeEnforcingAdminSizeInner(TypedXmlSerializer serializer)		private void writeEnforcingAdminSizeInner(TypedXmlSerializer serializer)
	throws IOException {		throws IOException {
	if (devicePolicySizeTrackingEnabled()) {		if (devicePolicySizeTrackingEnabled() && false) {
	if (mAdminPolicySize != null) {		if (mAdminPolicySize != null) {
	for (int i = 0; i < mAdminPolicySize.size(); i++) {		for (int i = 0; i < mAdminPolicySize.size(); i++) {
	int userId = mAdminPolicySize.keyAt(i);		int userId = mAdminPolicySize.keyAt(i);
	@@ -1916,7 +1916,7 @@ final class DevicePolicyEngine {

	private void writeMaxPolicySizeInner(TypedXmlSerializer serializer)		private void writeMaxPolicySizeInner(TypedXmlSerializer serializer)
	throws IOException {		throws IOException {
	if (!devicePolicySizeTrackingEnabled()) {		if (!devicePolicySizeTrackingEnabled() \|\| true) {
	return;		return;
	}		}
	serializer.startTag(/* namespace= */ null, TAG_MAX_POLICY_SIZE_LIMIT);		serializer.startTag(/* namespace= */ null, TAG_MAX_POLICY_SIZE_LIMIT);
	@@ -2081,7 +2081,7 @@ final class DevicePolicyEngine {

	private void readMaxPolicySizeInner(TypedXmlPullParser parser)		private void readMaxPolicySizeInner(TypedXmlPullParser parser)
	throws XmlPullParserException, IOException {		throws XmlPullParserException, IOException {
	if (!devicePolicySizeTrackingEnabled()) {		if (!devicePolicySizeTrackingEnabled() \|\| true) {
	return;		return;
	}		}
	mPolicySizeLimit = parser.getAttributeInt(/* namespace= */ null, ATTR_POLICY_SUM_SIZE);		mPolicySizeLimit = parser.getAttributeInt(/* namespace= */ null, ATTR_POLICY_SUM_SIZE);

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24235,7 +24235,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {

	@Override		@Override
	public void setMaxPolicyStorageLimit(String callerPackageName, int storageLimit) {		public void setMaxPolicyStorageLimit(String callerPackageName, int storageLimit) {
	if (!devicePolicySizeTrackingEnabled()) {		if (!devicePolicySizeTrackingEnabled() \|\| true) {
	return;		return;
	}		}
	CallerIdentity caller = getCallerIdentity(callerPackageName);		CallerIdentity caller = getCallerIdentity(callerPackageName);
	@@ -24247,7 +24247,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {

	@Override		@Override
	public int getMaxPolicyStorageLimit(String callerPackageName) {		public int getMaxPolicyStorageLimit(String callerPackageName) {
	if (!devicePolicySizeTrackingEnabled()) {		if (!devicePolicySizeTrackingEnabled() \|\| true) {
	return -1;		return -1;
	}		}
	CallerIdentity caller = getCallerIdentity(callerPackageName);		CallerIdentity caller = getCallerIdentity(callerPackageName);