Merge "Adding a timeout for active-unlock" into tm-dev (4207fcf3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/trust/TrustAgentWrapper.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.server.trust;

		import static android.service.trust.TrustAgentService.FLAG_GRANT_TRUST_DISPLAY_MESSAGE;
		import static android.service.trust.TrustAgentService.FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE;

		import android.annotation.TargetApi;
		import android.app.AlarmManager;
		@@ -158,7 +159,7 @@ public class TrustAgentWrapper {
		mMessage = (CharSequence) msg.obj;
		int flags = msg.arg1;
		mDisplayTrustGrantedMessage = (flags & FLAG_GRANT_TRUST_DISPLAY_MESSAGE) != 0;
		if ((flags & TrustAgentService.FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE) != 0) {
		if ((flags & FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE) != 0) {
		mWaitingForTrustableDowngrade = true;
		} else {
		mWaitingForTrustableDowngrade = false;
		@@ -638,6 +639,11 @@ public class TrustAgentWrapper {
		return mTrustable && mManagingTrust && !mTrustDisabledByDpm;
		}

		/** Set the trustagent as not trustable */
		public void setUntrustable() {
		mTrustable = false;
		}

		public boolean isManagingTrust() {
		return mManagingTrust && !mTrustDisabledByDpm;
		}

+230 −40

File changed.

Preview size limit exceeded, changes collapsed.