Merge "Clear secure user ID and notify keystore when lock is cleared" (e4e13b4a) · Commits · e / os / android_frameworks_base

core/java/android/service/gatekeeper/IGateKeeperService.aidl

+7 −0

Original line number	Diff line number	Diff line
		@@ -69,4 +69,11 @@ interface IGateKeeperService {
		* @param uid the Android user id
		*/
		long getSecureUserId(int uid);

		/**
		* Clears secure user id associated with the provided Android ID.
		* Must be called when password is set to NONE.
		* @param uid the Android user id.
		*/
		void clearSecureUserId(int uid);
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -388,7 +388,9 @@ public class LockSettingsService extends ILockSettings.Stub {
		byte[] currentHandle = getCurrentHandle(userId);

		if (pattern == null) {
		getGateKeeperService().clearSecureUserId(userId);
		mStorage.writePatternHash(null, userId);
		maybeUpdateKeystore(null, userId);
		return;
		}

		@@ -414,7 +416,9 @@ public class LockSettingsService extends ILockSettings.Stub {
		byte[] currentHandle = getCurrentHandle(userId);

		if (password == null) {
		getGateKeeperService().clearSecureUserId(userId);
		mStorage.writePasswordHash(null, userId);
		maybeUpdateKeystore(null, userId);
		return;
		}