Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO NOT MERGE] Fix extra constant value AGAIN am: c494783082

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20761390

Change-Id: If04af79136833b94054cf6a7fd661e47fe6f367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fabian Kozynski
2022-12-21 14:41:32 +00:00
committed by Automerger Merge Worker
parent 65e92dec92 c494783082
commit b5d8818776
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/service/controls/ControlsProviderService.java
View File

@@ -58,19 +58,24 @@ public abstract class ControlsProviderService extends Service {
* Manifest metadata to show a custom embedded activity as part of device controls. * 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 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 * The activity must be exported, enabled and protected by
* {@link Manifest.permission.BIND_CONTROLS}. * {@link Manifest.permission.BIND_CONTROLS}.
* *
* It is recommended that the activity is declared {@code android:resizeableActivity="true"}.
*
* @hide * @hide
*/ */
public static final String META_DATA_PANEL_ACTIVITY = public static final String META_DATA_PANEL_ACTIVITY =
"android.service.controls.META_DATA_PANEL_ACTIVITY"; "android.service.controls.META_DATA_PANEL_ACTIVITY";
/** /**
* Boolean extra containing the value of * Boolean extra containing the value of the setting allowing actions on a locked device.
* {@link android.provider.Settings.Secure#LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS}. *
* 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} * This is passed with the intent when the panel specified by {@link #META_DATA_PANEL_ACTIVITY}
* is launched. * is launched.
@@ -78,7 +83,7 @@ public abstract class ControlsProviderService extends Service {
* @hide * @hide
*/ */
public static final String EXTRA_LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS = 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 * @hide