Merge "Trust: Look at the security unlock method of the right user" into lmp-dev (ab84dba8) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/LockPatternUtils.java

+14 −5

Original line number	Diff line number	Diff line
		@@ -862,14 +862,23 @@ public class LockPatternUtils {
		* @return stored password quality
		*/
		public int getKeyguardStoredPasswordQuality() {
		int quality =
		(int) getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
		return getKeyguardStoredPasswordQuality(getCurrentOrCallingUserId());
		}

		/**
		* Retrieves the quality mode for {@param userHandle}.
		* {@see DevicePolicyManager#getPasswordQuality(android.content.ComponentName)}
		*
		* @return stored password quality
		*/
		public int getKeyguardStoredPasswordQuality(int userHandle) {
		int quality = (int) getLong(PASSWORD_TYPE_KEY,
		DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, userHandle);
		// If the user has chosen to use weak biometric sensor, then return the backup locking
		// method and treat biometric as a special case.
		if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {
		quality =
		(int) getLong(PASSWORD_TYPE_ALTERNATE_KEY,
		DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
		quality = (int) getLong(PASSWORD_TYPE_ALTERNATE_KEY,
		DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, userHandle);
		}
		return quality;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ public class TrustManagerService extends SystemService {
		obsoleteAgents.addAll(mActiveAgents);

		for (UserInfo userInfo : userInfos) {
		if (lockPatternUtils.getKeyguardStoredPasswordQuality()
		if (lockPatternUtils.getKeyguardStoredPasswordQuality(userInfo.id)
		== DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) continue;
		DevicePolicyManager dpm = lockPatternUtils.getDevicePolicyManager();
		int disabledFeatures = dpm.getKeyguardDisabledFeatures(null, userInfo.id);