Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef276999 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update device policy APIs after linter fix" am: 0eb6bb92 am: 41f045d4 am: abda4584 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378891



Change-Id: Iff666230eea3e72e867e0761f122b68845ba3a23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9a39022 abda4584

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

+2 −0
Original line number Diff line number Diff line
@@ -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 =