Merge "Simplify invalidation of lockscreen credential type cache" (eaf9d507) · Commits · e / os / android_frameworks_base

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

+1 −19

Original line number	Diff line number	Diff line
		@@ -143,8 +143,6 @@ import com.android.server.locksettings.SyntheticPasswordManager.AuthenticationTo
		import com.android.server.locksettings.SyntheticPasswordManager.TokenType;
		import com.android.server.locksettings.recoverablekeystore.RecoverableKeyStoreManager;
		import com.android.server.pm.UserManagerInternal;
		import com.android.server.utils.Watchable;
		import com.android.server.utils.Watcher;
		import com.android.server.wm.WindowManagerInternal;

		import libcore.util.HexEncoding;
		@@ -226,7 +224,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		protected final Handler mHandler;
		@VisibleForTesting
		protected final LockSettingsStorage mStorage;
		private final Watcher mStorageWatcher;
		private final LockSettingsStrongAuth mStrongAuth;
		private final SynchronizedStrongAuthTracker mStrongAuthTracker;
		private final BiometricDeferredQueue mBiometricDeferredQueue;
		@@ -563,12 +560,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		}
		}

		private class StorageWatcher extends Watcher {
		public void onChange(Watchable what) {
		LockSettingsService.this.onChange();
		}
		}

		public LockSettingsService(Context context) {
		this(new Injector(context));
		}
		@@ -608,16 +599,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		mStorage);

		LocalServices.addService(LockSettingsInternal.class, new LocalService());

		mStorageWatcher = new StorageWatcher();
		mStorage.registerObserver(mStorageWatcher);
		}

		/**
		* Invalidate caches if the storage has changed.
		*/
		private void onChange() {
		LockPatternUtils.invalidateCredentialTypeCache();
		}

		/**
		@@ -2732,6 +2713,7 @@ public class LockSettingsService extends ILockSettings.Stub {
		removeBiometricsForUser(userId);
		}
		setSyntheticPasswordHandleLocked(newHandle, userId);
		LockPatternUtils.invalidateCredentialTypeCache();
		synchronizeUnifiedWorkChallengeForProfiles(userId, profilePasswords);

		setUserPasswordMetrics(credential, userId);

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

+1 −8

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import com.android.internal.util.Preconditions;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.server.LocalServices;
		import com.android.server.PersistentDataBlockManagerInternal;
		import com.android.server.utils.WatchableImpl;

		import java.io.ByteArrayInputStream;
		import java.io.ByteArrayOutputStream;
		@@ -66,7 +65,7 @@ import java.util.Map;
		/**
		* Storage for the lock settings service.
		*/
		class LockSettingsStorage extends WatchableImpl {
		class LockSettingsStorage {

		private static final String TAG = "LockSettingsStorage";
		private static final String TABLE = "locksettings";
		@@ -136,7 +135,6 @@ class LockSettingsStorage extends WatchableImpl {
		} finally {
		db.endTransaction();
		}
		dispatchChange(this);
		}

		@VisibleForTesting
		@@ -194,7 +192,6 @@ class LockSettingsStorage extends WatchableImpl {
		} finally {
		db.endTransaction();
		}
		dispatchChange(this);
		}

		public void prefetchUser(int userId) {
		@@ -337,7 +334,6 @@ class LockSettingsStorage extends WatchableImpl {
		}
		}
		mCache.putFile(path, data);
		dispatchChange(this);
		}
		}

		@@ -353,7 +349,6 @@ class LockSettingsStorage extends WatchableImpl {
		Slog.w(TAG, "Failed to zeroize " + path, e);
		}
		path.delete();
		dispatchChange(this);
		mCache.putFile(path, null);
		}
		}
		@@ -472,7 +467,6 @@ class LockSettingsStorage extends WatchableImpl {
		} finally {
		db.endTransaction();
		}
		dispatchChange(this);
		}

		public void setBoolean(String key, boolean value, int userId) {
		@@ -551,7 +545,6 @@ class LockSettingsStorage extends WatchableImpl {
		}
		persistentDataBlock.setFrpCredentialHandle(PersistentData.toBytes(
		persistentType, userId, qualityForUi, payload));
		dispatchChange(this);
		}

		public PersistentData readPersistentDataBlock() {