Merge "Make TrustAgentService a SystemApi" into lmp-dev (1cc41c93) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −17

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ package android {
		field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
		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 = "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";
		@@ -27410,22 +27409,6 @@ package android.service.textservice {

		}

		package android.service.trust {

		public class TrustAgentService extends android.app.Service {
		ctor public TrustAgentService();
		method public final void grantTrust(java.lang.CharSequence, long, boolean);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public boolean onSetTrustAgentFeaturesEnabled(android.os.Bundle);
		method public void onUnlockAttempt(boolean);
		method public final void revokeTrust();
		field public static final java.lang.String KEY_FEATURES = "trust_agent_features";
		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";
		}

		}

		package android.service.voice {

		public class AlwaysOnHotwordDetector {

core/java/android/app/admin/DevicePolicyManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1568,7 +1568,7 @@ public class DevicePolicyManager {
		public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 1 << 3;

		/**
		* Ignore {@link TrustAgentService} state on secure keyguard screens
		* Ignore trust agent state on secure keyguard screens
		* (e.g. PIN/Pattern/Password).
		*/
		public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 1 << 4;

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.service.trust;

		import android.Manifest;
		import android.annotation.SdkConstant;
		import android.annotation.SystemApi;
		import android.app.Service;
		import android.app.admin.DevicePolicyManager;
		import android.content.ComponentName;
		@@ -58,7 +59,10 @@ import android.util.Slog;
		* <pre>
		* <trust-agent xmlns:android="http://schemas.android.com/apk/res/android"
		* android:settingsActivity=".TrustAgentSettings" /></pre>
		*
		* @hide
		*/
		@SystemApi
		public class TrustAgentService extends Service {
		private final String TAG = TrustAgentService.class.getSimpleName() +
		"[" + getClass().getSimpleName() + "]";

core/res/AndroidManifest.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -2730,9 +2730,10 @@
		android:label="@string/permlab_launch_trust_agent_settings"
		android:description="@string/permdesc_launch_trust_agent_settings" />

		<!-- Must be required by an {@link
		<!-- @SystemApi Must be required by an {@link
		android.service.trust.TrustAgentService},
		to ensure that only the system can bind to it. -->
		to ensure that only the system can bind to it.
		@hide -->
		<permission android:name="android.permission.BIND_TRUST_AGENT"
		android:protectionLevel="signature"
		android:label="@string/permlab_bind_trust_agent_service"

core/res/res/values/attrs.xml

+8 −7

Original line number	Diff line number	Diff line
		@@ -6563,18 +6563,19 @@
		<attr name="settingsActivity" />
		</declare-styleable>

		<!-- Use <code>trust-agent</code> as the root tag of the XML resource that
		<!-- @SystemApi 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. -->
		meta-data entry. Described here are the attributes that can be included in that tag.
		@hide -->
		<declare-styleable name="TrustAgent">
		<!-- Component name of an activity that allows the user to modify
		the settings for this trust agent. -->
		<!-- @SystemApi Component name of an activity that allows the user to modify
		the settings for this trust agent. @hide -->
		<attr name="settingsActivity" />
		<!-- Title for a preference that allows that user to launch the
		activity to modify trust agent settings. -->
		<!-- @SystemApi Title for a preference that allows that user to launch the
		activity to modify trust agent settings. @hide -->
		<attr name="title" />
		<!-- Summary for the same preference as the title. -->
		<!-- @SystemApi Summary for the same preference as the title. @hide -->
		<attr name="summary" />
		</declare-styleable>