am 33d3756f: Add setManagingTrust and expose it on lockscreen (0a338b42) · Commits · e / os / android_frameworks_base

core/java/android/app/trust/ITrustListener.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,4 +23,5 @@ package android.app.trust;
		*/
		oneway interface ITrustListener {
		void onTrustChanged(boolean enabled, int userId);
		void onTrustManagedChanged(boolean managed, int userId);
		}
		No newline at end of file

core/java/android/app/trust/TrustManager.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.util.Log;
		public class TrustManager {

		private static final int MSG_TRUST_CHANGED = 1;
		private static final int MSG_TRUST_MANAGED_CHANGED = 2;

		private static final String TAG = "TrustManager";

		@@ -98,6 +99,13 @@ public class TrustManager {
		mHandler.obtainMessage(MSG_TRUST_CHANGED, (enabled ? 1 : 0), userId,
		trustListener).sendToTarget();
		}

		@Override
		public void onTrustManagedChanged(boolean managed, int userId)
		throws RemoteException {
		mHandler.obtainMessage(MSG_TRUST_MANAGED_CHANGED, (managed ? 1 : 0), userId,
		trustListener).sendToTarget();
		}
		};
		mService.registerTrustListener(iTrustListener);
		mTrustListeners.put(trustListener, iTrustListener);
		@@ -133,6 +141,8 @@ public class TrustManager {
		case MSG_TRUST_CHANGED:
		((TrustListener)msg.obj).onTrustChanged(msg.arg1 != 0, msg.arg2);
		break;
		case MSG_TRUST_MANAGED_CHANGED:
		((TrustListener)msg.obj).onTrustManagedChanged(msg.arg1 != 0, msg.arg2);
		}
		}
		};
		@@ -145,5 +155,12 @@ public class TrustManager {
		* @param userId the user, for which the trust changed.
		*/
		void onTrustChanged(boolean enabled, int userId);

		/**
		* Reports that whether trust is managed has changed
		* @param enabled if true, at least one trust agent is managing trust.
		* @param userId the user, for which the state changed.
		*/
		void onTrustManagedChanged(boolean enabled, int userId);
		}
		}

core/java/android/service/trust/ITrustAgentServiceCallback.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,4 +25,5 @@ import android.os.UserHandle;
		oneway interface ITrustAgentServiceCallback {
		void grantTrust(CharSequence message, long durationMs, boolean initiatedByUser);
		void revokeTrust();
		void setManagingTrust(boolean managingTrust);
		}

core/java/android/service/trust/TrustAgentService.java

+51 −2

Original line number	Diff line number	Diff line
		@@ -66,6 +66,13 @@ import android.util.Slog;
		public class TrustAgentService extends Service {
		private final String TAG = TrustAgentService.class.getSimpleName() +
		"[" + getClass().getSimpleName() + "]";
		private static final boolean DEBUG = false;

		// Temporary workaround to allow current trust agent implementations to continue working.
		// This and the code guarded by this should be removed before shipping.
		// If true, calls setManagingTrust(true) after onCreate, if it wasn't already set.
		// TODO: Remove this once all agents are updated.
		private static final boolean SET_MANAGED_FOR_LEGACY_AGENTS = true;

		/**
		* The {@link Intent} that must be declared as handled by the service.
		@@ -88,12 +95,12 @@ public class TrustAgentService extends Service {

		private static final int MSG_UNLOCK_ATTEMPT = 1;

		private static final boolean DEBUG = false;

		private ITrustAgentServiceCallback mCallback;

		private Runnable mPendingGrantTrustTask;

		private boolean mManagingTrust;

		// Lock used to access mPendingGrantTrustTask and mCallback.
		private final Object mLock = new Object();

		@@ -109,6 +116,11 @@ public class TrustAgentService extends Service {

		@Override
		public void onCreate() {
		// TODO: Remove this once all agents are updated.
		if (SET_MANAGED_FOR_LEGACY_AGENTS) {
		setManagingTrust(true);
		}

		super.onCreate();
		ComponentName component = new ComponentName(this, getClass());
		try {
		@@ -163,10 +175,15 @@ public class TrustAgentService extends Service {
		* for this agent will automatically be revoked when the timeout expires.
		* @param initiatedByUser indicates that the user has explicitly initiated an action that proves
		* the user is about to use the device.
		* @throws IllegalStateException if the agent is not currently managing trust.
		*/
		public final void grantTrust(
		final CharSequence message, final long durationMs, final boolean initiatedByUser) {
		synchronized (mLock) {
		if (!mManagingTrust) {
		throw new IllegalStateException("Cannot grant trust if agent is not managing trust."
		+ " Call setManagingTrust(true) first.");
		}
		if (mCallback != null) {
		try {
		mCallback.grantTrust(message.toString(), durationMs, initiatedByUser);
		@@ -204,6 +221,29 @@ public class TrustAgentService extends Service {
		}
		}

		/**
		* Call to notify the system if the agent is ready to manage trust.
		*
		* This property is not persistent across recreating the service and defaults to false.
		* Therefore this method is typically called when initializing the agent in {@link #onCreate}.
		*
		* @param managingTrust indicates if the agent would like to manage trust.
		*/
		public final void setManagingTrust(boolean managingTrust) {
		synchronized (mLock) {
		if (mManagingTrust != managingTrust) {
		mManagingTrust = managingTrust;
		if (mCallback != null) {
		try {
		mCallback.setManagingTrust(managingTrust);
		} catch (RemoteException e) {
		onError("calling setManagingTrust()");
		}
		}
		}
		}
		}

		@Override
		public final IBinder onBind(Intent intent) {
		if (DEBUG) Slog.v(TAG, "onBind() intent = " + intent);
		@@ -221,6 +261,15 @@ public class TrustAgentService extends Service {
		public void setCallback(ITrustAgentServiceCallback callback) {
		synchronized (mLock) {
		mCallback = callback;
		// The managingTrust property is false implicitly on the server-side, so we only
		// need to set it here if the agent has decided to manage trust.
		if (mManagingTrust) {
		try {
		mCallback.setManagingTrust(mManagingTrust);
		} catch (RemoteException e ) {
		onError("calling setManagingTrust()");
		}
		}
		if (mPendingGrantTrustTask != null) {
		mPendingGrantTrustTask.run();
		mPendingGrantTrustTask = null;

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -216,6 +216,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		};

		private SparseBooleanArray mUserHasTrust = new SparseBooleanArray();
		private SparseBooleanArray mUserTrustIsManaged = new SparseBooleanArray();
		private SparseBooleanArray mUserFingerprintRecognized = new SparseBooleanArray();

		@Override
		@@ -230,6 +231,18 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		}
		}

		@Override
		public void onTrustManagedChanged(boolean managed, int userId) {
		mUserTrustIsManaged.put(userId, managed);

		for (int i = 0; i < mCallbacks.size(); i++) {
		KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
		if (cb != null) {
		cb.onTrustManagedChanged(userId);
		}
		}
		}

		private void onFingerprintRecognized(int userId) {
		mUserFingerprintRecognized.put(userId, true);
		for (int i = 0; i < mCallbacks.size(); i++) {
		@@ -305,6 +318,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		\|\| mUserFingerprintRecognized.get(userId);
		}

		public boolean getUserTrustIsManaged(int userId) {
		return mUserTrustIsManaged.get(userId) && !isTrustDisabled(userId);
		}

		static class DisplayClientState {
		public int clientGeneration;
		public boolean clearing;