Merge "Construct ESIDCalculator class object just once" (f5183c6e) · Commits · e / os / android_frameworks_base

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

+19 −10

Original line number	Diff line number	Diff line
		@@ -648,6 +648,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		private final DevicePolicyCacheImpl mPolicyCache = new DevicePolicyCacheImpl();
		private final DeviceStateCacheImpl mStateCache = new DeviceStateCacheImpl();
		private final Object mESIDInitilizationLock = new Object();
		private EnterpriseSpecificIdCalculator mEsidCalculator;

		/**
		* Contains (package-user) pairs to remove. An entry (p, u) implies that removal of package p
		@@ -1473,6 +1475,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		return new LockPatternUtils(mContext);
		}

		EnterpriseSpecificIdCalculator newEnterpriseSpecificIdCalculator() {
		return new EnterpriseSpecificIdCalculator(mContext);
		}

		boolean storageManagerIsFileBasedEncryptionEnabled() {
		return StorageManager.isFileEncryptedNativeOnly();
		}
		@@ -16919,6 +16925,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		Slogf.i(LOG_TAG, "Setting Enterprise ID to %s for user %d", organizationId, userId);

		synchronized (mESIDInitilizationLock) {
		if (mEsidCalculator == null) {
		mInjector.binderWithCleanCallingIdentity(() -> {
		mEsidCalculator = mInjector.newEnterpriseSpecificIdCalculator();
		});
		}
		}

		final String ownerPackage;
		synchronized (getLockObject()) {
		final ActiveAdmin owner = getDeviceOrProfileOwnerAdminLocked(userId);
		@@ -16936,16 +16950,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		"The organization ID has been previously set to a different value and cannot "
		+ "be changed");
		final String dpcPackage = owner.info.getPackageName();
		mInjector.binderWithCleanCallingIdentity(() -> {
		EnterpriseSpecificIdCalculator esidCalculator =
		new EnterpriseSpecificIdCalculator(mContext);

		final String esid = esidCalculator.calculateEnterpriseId(dpcPackage,
		final String esid = mEsidCalculator.calculateEnterpriseId(dpcPackage,
		organizationId);
		owner.mOrganizationId = organizationId;
		owner.mEnrollmentSpecificId = esid;
		saveSettingsLocked(userId);
		});
		}

		DevicePolicyEventLogger