Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev (076e7255) · Commits · e / os / android_frameworks_base

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -479,6 +479,7 @@ public class LockPatternUtils {
		saveLockPattern(null);
		setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
		setLong(PASSWORD_TYPE_ALTERNATE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
		onAfterChangingPassword();
		}

		/**
		@@ -565,6 +566,7 @@ public class LockPatternUtils {
		dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0,
		0, 0, 0, 0, 0, userId);
		}
		onAfterChangingPassword();
		} catch (RemoteException re) {
		Log.e(TAG, "Couldn't save lock pattern " + re);
		}
		@@ -844,6 +846,7 @@ public class LockPatternUtils {
		DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0, 0, 0, 0, 0, 0,
		userHandle);
		}
		onAfterChangingPassword();
		} catch (RemoteException re) {
		// Cant do much
		Log.e(TAG, "Unable to save lock password " + re);
		@@ -1561,4 +1564,8 @@ public class LockPatternUtils {
		public void requireCredentialEntry(int userId) {
		getTrustManager().reportRequireCredentialEntry(userId);
		}

		private void onAfterChangingPassword() {
		getTrustManager().reportEnabledTrustAgentsChanged(getCurrentOrCallingUserId());
		}
		}

+2 −0

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

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