Merge "[DO NOT MERGE] Fix extra constant value AGAIN" into tm-qpr-dev (b0b297da) · Commits · e / os / android_frameworks_base

core/java/android/service/controls/ControlsProviderService.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -58,19 +58,24 @@ public abstract class ControlsProviderService extends Service {
		* Manifest metadata to show a custom embedded activity as part of device controls.
		*
		* The value of this metadata must be the {@link ComponentName} as a string of an activity in
		* the same package that will be launched as part of a TaskView.
		* the same package that will be launched embedded in the device controls space.
		*
		* The activity must be exported, enabled and protected by
		* {@link Manifest.permission.BIND_CONTROLS}.
		*
		* It is recommended that the activity is declared {@code android:resizeableActivity="true"}.
		*
		* @hide
		*/
		public static final String META_DATA_PANEL_ACTIVITY =
		"android.service.controls.META_DATA_PANEL_ACTIVITY";

		/**
		* Boolean extra containing the value of
		* {@link android.provider.Settings.Secure#LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS}.
		* Boolean extra containing the value of the setting allowing actions on a locked device.
		*
		* This corresponds to the setting that indicates whether the user has
		* consented to allow actions on devices that declare {@link Control#isAuthRequired()} as
		* {@code false} when the device is locked.
		*
		* This is passed with the intent when the panel specified by {@link #META_DATA_PANEL_ACTIVITY}
		* is launched.
		@@ -78,7 +83,7 @@ public abstract class ControlsProviderService extends Service {
		* @hide
		*/
		public static final String EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS =
		"android.service.controls.extra.EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS";
		"android.service.controls.extra.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS";

		/**
		* @hide