Merge "Apply revised TrustAgent API" (3242f51c) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ package android {
		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
		field public static final java.lang.String BIND_ROUTE_PROVIDER = "android.permission.BIND_ROUTE_PROVIDER";
		field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
		field public static final java.lang.String BIND_TRUST_AGENT_SERVICE = "android.permission.BIND_TRUST_AGENT_SERVICE";
		field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";
		field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";
		field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";
		field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";
		@@ -25327,10 +25327,10 @@ package android.service.trust {

		public class TrustAgentService extends android.app.Service {
		ctor public TrustAgentService();
		method protected final void enableTrust(java.lang.String, long, boolean);
		method public final void grantTrust(java.lang.CharSequence, long, boolean);
		method public final android.os.IBinder onBind(android.content.Intent);
		method protected void onUnlockAttempt(boolean);
		method protected final void revokeTrust();
		method public void onUnlockAttempt(boolean);
		method public final void revokeTrust();
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.trust.TrustAgentService";
		field public static final java.lang.String TRUST_AGENT_META_DATA = "android.service.trust.trustagent";
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,6 @@ import android.os.UserHandle;
		* @hide
		*/
		oneway interface ITrustAgentServiceCallback {
		void enableTrust(String message, long durationMs, boolean initiatedByUser);
		void grantTrust(CharSequence message, long durationMs, boolean initiatedByUser);
		void revokeTrust();
		}

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -29,12 +29,12 @@ import android.util.Slog;
		* to be trusted.
		*
		* <p>To extend this class, you must declare the service in your manifest file with
		* the {@link android.Manifest.permission#BIND_TRUST_AGENT_SERVICE} permission
		* the {@link android.Manifest.permission#BIND_TRUST_AGENT} permission
		* and include an intent filter with the {@link #SERVICE_INTERFACE} action. For example:</p>
		* <pre>
		* <service android:name=".TrustAgent"
		* android:label="@string/service_name"
		* android:permission="android.permission.BIND_TRUST_AGENT_SERVICE">
		* android:permission="android.permission.BIND_TRUST_AGENT">
		* <intent-filter>
		* <action android:name="android.service.trust.TrustAgentService" />
		* </intent-filter>
		@@ -47,7 +47,7 @@ import android.util.Slog;
		* {@link android.R.styleable#TrustAgent}. For example:</p>
		*
		* <pre>
		* <trust_agent xmlns:android="http://schemas.android.com/apk/res/android"
		* <trust-agent xmlns:android="http://schemas.android.com/apk/res/android"
		* android:settingsActivity=".TrustAgentSettings" /></pre>
		*/
		public class TrustAgentService extends Service {
		@@ -88,7 +88,7 @@ public class TrustAgentService extends Service {
		*
		* @param successful true if the attempt succeeded
		*/
		protected void onUnlockAttempt(boolean successful) {
		public void onUnlockAttempt(boolean successful) {
		}

		private void onError(String msg) {
		@@ -96,7 +96,7 @@ public class TrustAgentService extends Service {
		}

		/**
		* Call to enable trust on the device.
		* Call to grant trust on the device.
		*
		* @param message describes why the device is trusted, e.g. "Trusted by location".
		* @param durationMs amount of time in milliseconds to keep the device in a trusted state. Trust
		@@ -104,10 +104,10 @@ public class TrustAgentService extends Service {
		* @param initiatedByUser indicates that the user has explicitly initiated an action that proves
		* the user is about to use the device.
		*/
		protected final void enableTrust(String message, long durationMs, boolean initiatedByUser) {
		public final void grantTrust(CharSequence message, long durationMs, boolean initiatedByUser) {
		if (mCallback != null) {
		try {
		mCallback.enableTrust(message, durationMs, initiatedByUser);
		mCallback.grantTrust(message.toString(), durationMs, initiatedByUser);
		} catch (RemoteException e) {
		onError("calling enableTrust()");
		}
		@@ -117,7 +117,7 @@ public class TrustAgentService extends Service {
		/**
		* Call to revoke trust on the device.
		*/
		protected final void revokeTrust() {
		public final void revokeTrust() {
		if (mCallback != null) {
		try {
		mCallback.revokeTrust();

core/res/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -2613,7 +2613,7 @@
		<!-- Must be required by an {@link
		android.service.trust.TrustAgentService},
		to ensure that only the system can bind to it. -->
		<permission android:name="android.permission.BIND_TRUST_AGENT_SERVICE"
		<permission android:name="android.permission.BIND_TRUST_AGENT"
		android:protectionLevel="signature"
		android:label="@string/permlab_bind_trust_agent_service"
		android:description="@string/permdesc_bind_trust_agent_service" />

core/res/res/values/attrs.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -6115,13 +6115,13 @@
		<attr name="settingsActivity" />
		</declare-styleable>

		<!-- Use <code>trust_agent</code> as the root tag of the XML resource that
		<!-- Use <code>trust-agent</code> as the root tag of the XML resource that
		describes an {@link android.service.trust.TrustAgentService}, which is
		referenced from its {@link android.service.trust.TrustAgentService#TRUST_AGENT_META_DATA}
		meta-data entry. Described here are the attributes that can be included in that tag. -->
		<declare-styleable name="TrustAgent">
		<!-- Component name of an activity that allows the user to modify
		the settings for this TrustAgent. -->
		the settings for this trust agent. -->
		<attr name="settingsActivity" />
		</declare-styleable>