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

Commit ec43b5a3 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Update device policy APIs after linter fix" am: 0eb6bb92 am:... 

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

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 =