Merge "Remove checks of private space flags from LockSettingsService" into main (3e426c32) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/locksettings/LockSettingsService.java

+13 −25

Original line number	Diff line number	Diff line
		@@ -844,14 +844,10 @@ public class LockSettingsService extends ILockSettings.Stub {
		// TODO(b/319142556): It might make more sense to reset the strong auth flags when CE
		// storage is locked, instead of when the user is stopped. This would ensure the flags get
		// reset if CE storage is locked later for a user that allows delayed locking.
		if (android.os.Flags.allowPrivateProfile()
		&& android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
		&& android.multiuser.Flags.enablePrivateSpaceFeatures()) {
		UserProperties userProperties = getUserProperties(userId);
		if (userProperties != null && userProperties.getAllowStoppingUserWithDelayedLocking()) {
		return;
		}
		}
		int strongAuthRequired = LockPatternUtils.StrongAuthTracker.getDefaultFlags(mContext);
		requireStrongAuth(strongAuthRequired, userId);

		@@ -944,21 +940,14 @@ public class LockSettingsService extends ILockSettings.Stub {
		mStorage.prefetchUser(UserHandle.USER_SYSTEM);
		mBiometricDeferredQueue.systemReady(mInjector.getFingerprintManager(),
		mInjector.getFaceManager(), mInjector.getBiometricManager());
		if (android.os.Flags.allowPrivateProfile()
		&& android.multiuser.Flags.enablePrivateSpaceFeatures()
		&& android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()) {
		mStorageManagerInternal.registerStorageLockEventListener(mCeStorageLockEventListener);
		}
		}

		private final ICeStorageLockEventListener mCeStorageLockEventListener =
		new ICeStorageLockEventListener() {
		@Override
		public void onStorageLocked(int userId) {
		Slog.i(TAG, "Storage lock event received for " + userId);
		if (android.os.Flags.allowPrivateProfile()
		&& android.multiuser.Flags.enablePrivateSpaceFeatures()
		&& android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()) {
		mHandler.post(() -> {
		UserProperties userProperties = getUserProperties(userId);
		if (userProperties != null && userProperties
		@@ -968,7 +957,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		requireStrongAuth(strongAuthRequired, userId);
		}
		});
		}
		}};

		private void loadEscrowData() {