summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-01-11 16:46:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-11 16:46:26 +0000
commit41f045d4b3d6078188e36370700fadf3f9856e41 (patch)
treed61f22a0a025261972f4349dffc5aec4647663f3
parent10bcea7aa94429ac0b686613381939efaa8f033a (diff)
parent0eb6bb9281eda59eced6b38e393ea8f98abd63b5 (diff)
Merge "Update device policy APIs after linter fix" am: 0eb6bb9281
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378891 Change-Id: If218be9d4d331e099a5b174df6244c91d3f333f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 34c91c360dbe..bfab8c9508a1 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2391,6 +2391,7 @@ public class DevicePolicyManager {
* applied (cross profile intent filters updated). Only usesd for CTS tests.
* @hide
*/
+ @SuppressLint("ActionValue")
@TestApi
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED =
@@ -2401,6 +2402,7 @@ public class DevicePolicyManager {
* has been changed.
* @hide
*/
+ @SuppressLint("ActionValue")
@TestApi
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_DEVICE_POLICY_CONSTANTS_CHANGED =