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

Commit abff0121 authored by Ilyas Sung's avatar Ilyas Sung
Browse files

Added SupportsCoexistence annotations to updated Api's 

Bug: 257266753
Test: m
Change-Id: Id2a1f9a2eebfc0ecbec66d3c99e29e2eb8ea9be5
parent e1d5fd1e

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ import android.annotation.RequiresPermission; 
import android.annotation.SdkConstant;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.StringDef;

import android.annotation.StringDef;

import android.annotation.SupportsCoexistence;

import android.annotation.SuppressLint;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.SystemService;
@@ -8595,6 +8596,7 @@ public class DevicePolicyManager { 
     * primary user, or a profile owner of an organization-owned managed profile or a holder of the

     * primary user, or a profile owner of an organization-owned managed profile or a holder of the

     * permission {@link android.Manifest.permission#SET_TIME_ZONE}.

     * permission {@link android.Manifest.permission#SET_TIME_ZONE}.

     */

     */

    @SupportsCoexistence

    @RequiresPermission(value = SET_TIME_ZONE, conditional = true)

    @RequiresPermission(value = SET_TIME_ZONE, conditional = true)

    public void setAutoTimeZoneEnabled(@NonNull ComponentName admin, boolean enabled) {

    public void setAutoTimeZoneEnabled(@NonNull ComponentName admin, boolean enabled) {

        throwIfParentInstance("setAutoTimeZone");

        throwIfParentInstance("setAutoTimeZone");
@@ -9664,6 +9666,7 @@ public class DevicePolicyManager { 
     * @param activity The Activity that is added as default intent handler.

     * @param activity The Activity that is added as default intent handler.

     * @throws SecurityException if {@code admin} is not a device or profile owner.

     * @throws SecurityException if {@code admin} is not a device or profile owner.

     */

     */

    @SupportsCoexistence

    public void addPersistentPreferredActivity(@NonNull ComponentName admin, IntentFilter filter,

    public void addPersistentPreferredActivity(@NonNull ComponentName admin, IntentFilter filter,

            @NonNull ComponentName activity) {

            @NonNull ComponentName activity) {

        throwIfParentInstance("addPersistentPreferredActivity");

        throwIfParentInstance("addPersistentPreferredActivity");
@@ -10623,6 +10626,7 @@ public class DevicePolicyManager { 
     *                           profile owner of an organization-owned managed profile and the

     *                           profile owner of an organization-owned managed profile and the

     *                           list of permitted input method package names is not null or empty.

     *                           list of permitted input method package names is not null or empty.

     */

     */

    @SupportsCoexistence

    public boolean setPermittedInputMethods(

    public boolean setPermittedInputMethods(

            @NonNull ComponentName admin, List<String> packageNames) {

            @NonNull ComponentName admin, List<String> packageNames) {

        if (mService != null) {

        if (mService != null) {
@@ -11695,6 +11699,7 @@ public class DevicePolicyManager { 
     * @see DeviceAdminReceiver#onLockTaskModeExiting(Context, Intent)

     * @see DeviceAdminReceiver#onLockTaskModeExiting(Context, Intent)

     * @see UserManager#DISALLOW_CREATE_WINDOWS

     * @see UserManager#DISALLOW_CREATE_WINDOWS

     */

     */

    @SupportsCoexistence

    public void setLockTaskPackages(@NonNull ComponentName admin, @NonNull String[] packages)

    public void setLockTaskPackages(@NonNull ComponentName admin, @NonNull String[] packages)

            throws SecurityException {

            throws SecurityException {

        throwIfParentInstance("setLockTaskPackages");

        throwIfParentInstance("setLockTaskPackages");
@@ -11763,6 +11768,7 @@ public class DevicePolicyManager { 
     * affiliated user or profile, or the profile owner when no device owner is set.

     * affiliated user or profile, or the profile owner when no device owner is set.

     * @see #isAffiliatedUser

     * @see #isAffiliatedUser

     **/

     **/

    @SupportsCoexistence

    public void setLockTaskFeatures(@NonNull ComponentName admin, @LockTaskFeature int flags) {

    public void setLockTaskFeatures(@NonNull ComponentName admin, @LockTaskFeature int flags) {

        throwIfParentInstance("setLockTaskFeatures");

        throwIfParentInstance("setLockTaskFeatures");

        if (mService != null) {

        if (mService != null) {
@@ -12266,6 +12272,7 @@ public class DevicePolicyManager { 
     * @see #setDelegatedScopes

     * @see #setDelegatedScopes

     * @see #DELEGATION_BLOCK_UNINSTALL

     * @see #DELEGATION_BLOCK_UNINSTALL

     */

     */

    @SupportsCoexistence

    public void setUninstallBlocked(@Nullable ComponentName admin, String packageName,

    public void setUninstallBlocked(@Nullable ComponentName admin, String packageName,

            boolean uninstallBlocked) {

            boolean uninstallBlocked) {

        throwIfParentInstance("setUninstallBlocked");

        throwIfParentInstance("setUninstallBlocked");
@@ -12754,6 +12761,7 @@ public class DevicePolicyManager { 
     * @see #setDelegatedScopes

     * @see #setDelegatedScopes

     * @see #DELEGATION_PERMISSION_GRANT

     * @see #DELEGATION_PERMISSION_GRANT

     */

     */

    @SupportsCoexistence

    public boolean setPermissionGrantState(@NonNull ComponentName admin,

    public boolean setPermissionGrantState(@NonNull ComponentName admin,

            @NonNull String packageName, @NonNull String permission,

            @NonNull String packageName, @NonNull String permission,

            @PermissionGrantState int grantState) {

            @PermissionGrantState int grantState) {
@@ -15300,6 +15308,7 @@ public class DevicePolicyManager { 
     * @param packages The package names for the apps.

     * @param packages The package names for the apps.

     * @throws SecurityException if {@code admin} is not a device owner or a profile owner.

     * @throws SecurityException if {@code admin} is not a device owner or a profile owner.

     */

     */

    @SupportsCoexistence

    public void setUserControlDisabledPackages(@NonNull ComponentName admin,

    public void setUserControlDisabledPackages(@NonNull ComponentName admin,

            @NonNull List<String> packages) {

            @NonNull List<String> packages) {

        throwIfParentInstance("setUserControlDisabledPackages");

        throwIfParentInstance("setUserControlDisabledPackages");