Merge "Merge "Update device policy APIs after linter fix" am: 0eb6bb9281 am: 41f045d4b3 am: abda4584b0"

This commit is contained in:
Automerger Merge Worker
2023-01-11 17:29:01 +00:00
committed by Android (Google) Code Review

View File

@@ -2417,6 +2417,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 =
@@ -2427,6 +2428,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 =