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

Commit 468e0cdb authored by Elis Elliott's avatar Elis Elliott
Browse files

Add permission checks to all DPM apis used by financed devices. 

Bug: 234609037

Test: btest android.devicepolicy.cts.SupportMessageTest
Change-Id: I400cc9363e1d8cb4df2b61442d72efa70f3cb098
parent 81e61228

core/api/current.txt

+24 −24
Original line number Diff line number Diff line
@@ -7728,7 +7728,7 @@ package android.app.admin { 
    method public void addCrossProfileIntentFilter(@NonNull android.content.ComponentName, android.content.IntentFilter, int);

    method public boolean addCrossProfileWidgetProvider(@NonNull android.content.ComponentName, String);

    method public int addOverrideApn(@NonNull android.content.ComponentName, @NonNull android.telephony.data.ApnSetting);

    method public void addPersistentPreferredActivity(@NonNull android.content.ComponentName, android.content.IntentFilter, @NonNull android.content.ComponentName);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_TASK, conditional=true) public void addPersistentPreferredActivity(@Nullable android.content.ComponentName, android.content.IntentFilter, @NonNull android.content.ComponentName);

    method public void addUserRestriction(@NonNull android.content.ComponentName, String);

    method public void addUserRestrictionGlobally(@NonNull String);

    method public boolean bindDeviceAdminServiceAsUser(@NonNull android.content.ComponentName, android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull android.os.UserHandle);
@@ -7737,7 +7737,7 @@ package android.app.admin { 
    method public void clearApplicationUserData(@NonNull android.content.ComponentName, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.app.admin.DevicePolicyManager.OnClearApplicationUserDataListener);

    method public void clearCrossProfileIntentFilters(@NonNull android.content.ComponentName);

    method @Deprecated public void clearDeviceOwnerApp(String);

    method public void clearPackagePersistentPreferredActivities(@NonNull android.content.ComponentName, String);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_TASK, conditional=true) public void clearPackagePersistentPreferredActivities(@Nullable android.content.ComponentName, String);

    method @Deprecated public void clearProfileOwner(@NonNull android.content.ComponentName);

    method public boolean clearResetPasswordToken(android.content.ComponentName);

    method public void clearUserRestriction(@NonNull android.content.ComponentName, String);
@@ -7753,9 +7753,9 @@ package android.app.admin { 
    method @Nullable public String getAlwaysOnVpnPackage(@NonNull android.content.ComponentName);

    method @NonNull @WorkerThread public android.os.Bundle getApplicationRestrictions(@Nullable android.content.ComponentName, String);

    method @Deprecated @Nullable public String getApplicationRestrictionsManagingPackage(@NonNull android.content.ComponentName);

    method @RequiresPermission(anyOf={android.Manifest.permission.SET_TIME, "android.permission.QUERY_ADMIN_POLICY"}, conditional=true) public boolean getAutoTimeEnabled(@NonNull android.content.ComponentName);

    method @RequiresPermission(anyOf={android.Manifest.permission.SET_TIME, "android.permission.QUERY_ADMIN_POLICY"}, conditional=true) public boolean getAutoTimeEnabled(@Nullable android.content.ComponentName);

    method @Deprecated public boolean getAutoTimeRequired();

    method @RequiresPermission(anyOf={android.Manifest.permission.SET_TIME_ZONE, "android.permission.QUERY_ADMIN_POLICY"}, conditional=true) public boolean getAutoTimeZoneEnabled(@NonNull android.content.ComponentName);

    method @RequiresPermission(anyOf={android.Manifest.permission.SET_TIME_ZONE, "android.permission.QUERY_ADMIN_POLICY"}, conditional=true) public boolean getAutoTimeZoneEnabled(@Nullable android.content.ComponentName);

    method @NonNull public java.util.List<android.os.UserHandle> getBindDeviceAdminTargetUsers(@NonNull android.content.ComponentName);

    method public boolean getBluetoothContactSharingDisabled(@NonNull android.content.ComponentName);

    method public boolean getCameraDisabled(@Nullable android.content.ComponentName);
@@ -7780,8 +7780,8 @@ package android.app.admin { 
    method @Nullable public java.util.List<java.lang.String> getKeepUninstalledPackages(@Nullable android.content.ComponentName);

    method @NonNull public java.util.Map<java.lang.Integer,java.util.Set<java.lang.String>> getKeyPairGrants(@NonNull String);

    method public int getKeyguardDisabledFeatures(@Nullable android.content.ComponentName);

    method public int getLockTaskFeatures(@NonNull android.content.ComponentName);

    method @NonNull public String[] getLockTaskPackages(@NonNull android.content.ComponentName);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_TASK, conditional=true) public int getLockTaskFeatures(@Nullable android.content.ComponentName);

    method @NonNull @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_TASK, conditional=true) public String[] getLockTaskPackages(@Nullable android.content.ComponentName);

    method @Nullable public CharSequence getLongSupportMessage(@NonNull android.content.ComponentName);

    method @Nullable public android.app.admin.PackagePolicy getManagedProfileCallerIdAccessPolicy();

    method @Nullable public android.app.admin.PackagePolicy getManagedProfileContactsAccessPolicy();
@@ -7795,7 +7795,7 @@ package android.app.admin { 
    method @RequiresPermission(value=android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, conditional=true) public int getNearbyAppStreamingPolicy();

    method @RequiresPermission(value=android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, conditional=true) public int getNearbyNotificationStreamingPolicy();

    method @Deprecated @ColorInt public int getOrganizationColor(@NonNull android.content.ComponentName);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY) public CharSequence getOrganizationName(@Nullable android.content.ComponentName);

    method @Nullable @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, conditional=true) public CharSequence getOrganizationName(@Nullable android.content.ComponentName);

    method public java.util.List<android.telephony.data.ApnSetting> getOverrideApns(@NonNull android.content.ComponentName);

    method @NonNull public android.app.admin.DevicePolicyManager getParentProfileInstance(@NonNull android.content.ComponentName);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY}, conditional=true) public int getPasswordComplexity();
@@ -7812,7 +7812,7 @@ package android.app.admin { 
    method @Deprecated public int getPasswordMinimumUpperCase(@Nullable android.content.ComponentName);

    method @Deprecated public int getPasswordQuality(@Nullable android.content.ComponentName);

    method @Nullable public android.app.admin.SystemUpdateInfo getPendingSystemUpdate(@NonNull android.content.ComponentName);

    method public int getPermissionGrantState(@Nullable android.content.ComponentName, @NonNull String, @NonNull String);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, conditional=true) public int getPermissionGrantState(@Nullable android.content.ComponentName, @NonNull String, @NonNull String);

    method public int getPermissionPolicy(android.content.ComponentName);

    method @Nullable public java.util.List<java.lang.String> getPermittedAccessibilityServices(@NonNull android.content.ComponentName);

    method @Nullable public java.util.List<java.lang.String> getPermittedCrossProfileNotificationListeners(@NonNull android.content.ComponentName);
@@ -7824,14 +7824,14 @@ package android.app.admin { 
    method @NonNull public android.app.admin.DevicePolicyResourcesManager getResources();

    method public boolean getScreenCaptureDisabled(@Nullable android.content.ComponentName);

    method public java.util.List<android.os.UserHandle> getSecondaryUsers(@NonNull android.content.ComponentName);

    method public CharSequence getShortSupportMessage(@NonNull android.content.ComponentName);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, conditional=true) public CharSequence getShortSupportMessage(@Nullable android.content.ComponentName);

    method public CharSequence getStartUserSessionMessage(@NonNull android.content.ComponentName);

    method @Deprecated public boolean getStorageEncryption(@Nullable android.content.ComponentName);

    method public int getStorageEncryptionStatus();

    method @Nullable public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();

    method @Nullable public android.os.PersistableBundle getTransferOwnershipBundle();

    method @Nullable public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName);

    method @NonNull public java.util.List<java.lang.String> getUserControlDisabledPackages(@NonNull android.content.ComponentName);

    method @NonNull @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_APPS_CONTROL, conditional=true) public java.util.List<java.lang.String> getUserControlDisabledPackages(@Nullable android.content.ComponentName);

    method @NonNull public android.os.Bundle getUserRestrictions(@NonNull android.content.ComponentName);

    method @NonNull public android.os.Bundle getUserRestrictionsGlobally();

    method @Nullable public String getWifiMacAddress(@Nullable android.content.ComponentName);
@@ -7906,9 +7906,9 @@ package android.app.admin { 
    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_PACKAGE_STATE, conditional=true) public boolean setApplicationHidden(@Nullable android.content.ComponentName, String, boolean);

    method @WorkerThread public void setApplicationRestrictions(@Nullable android.content.ComponentName, String, android.os.Bundle);

    method @Deprecated public void setApplicationRestrictionsManagingPackage(@NonNull android.content.ComponentName, @Nullable String) throws android.content.pm.PackageManager.NameNotFoundException;

    method @RequiresPermission(value=android.Manifest.permission.SET_TIME, conditional=true) public void setAutoTimeEnabled(@NonNull android.content.ComponentName, boolean);

    method @RequiresPermission(value=android.Manifest.permission.SET_TIME, conditional=true) public void setAutoTimeEnabled(@Nullable android.content.ComponentName, boolean);

    method @Deprecated public void setAutoTimeRequired(@NonNull android.content.ComponentName, boolean);

    method @RequiresPermission(value=android.Manifest.permission.SET_TIME_ZONE, conditional=true) public void setAutoTimeZoneEnabled(@NonNull android.content.ComponentName, boolean);

    method @RequiresPermission(value=android.Manifest.permission.SET_TIME_ZONE, conditional=true) public void setAutoTimeZoneEnabled(@Nullable android.content.ComponentName, boolean);

    method public void setBackupServiceEnabled(@NonNull android.content.ComponentName, boolean);

    method public void setBluetoothContactSharingDisabled(@NonNull android.content.ComponentName, boolean);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_CAMERA, conditional=true) public void setCameraDisabled(@Nullable android.content.ComponentName, boolean);
@@ -7934,8 +7934,8 @@ package android.app.admin { 
    method public boolean setKeyguardDisabled(@NonNull android.content.ComponentName, boolean);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_KEYGUARD, conditional=true) public void setKeyguardDisabledFeatures(@Nullable android.content.ComponentName, int);

    method public void setLocationEnabled(@NonNull android.content.ComponentName, boolean);

    method public void setLockTaskFeatures(@NonNull android.content.ComponentName, int);

    method public void setLockTaskPackages(@NonNull android.content.ComponentName, @NonNull String[]) throws java.lang.SecurityException;

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_TASK, conditional=true) public void setLockTaskFeatures(@Nullable android.content.ComponentName, int);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_TASK, conditional=true) public void setLockTaskPackages(@Nullable android.content.ComponentName, @NonNull String[]) throws java.lang.SecurityException;

    method public void setLogoutEnabled(@NonNull android.content.ComponentName, boolean);

    method public void setLongSupportMessage(@NonNull android.content.ComponentName, @Nullable CharSequence);

    method public void setManagedProfileCallerIdAccessPolicy(@Nullable android.app.admin.PackagePolicy);
@@ -7953,7 +7953,7 @@ package android.app.admin { 
    method public void setNetworkLoggingEnabled(@Nullable android.content.ComponentName, boolean);

    method @Deprecated public void setOrganizationColor(@NonNull android.content.ComponentName, int);

    method public void setOrganizationId(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY) public void setOrganizationName(@Nullable android.content.ComponentName, @Nullable CharSequence);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY, conditional=true) public void setOrganizationName(@Nullable android.content.ComponentName, @Nullable CharSequence);

    method public void setOverrideApnsEnabled(@NonNull android.content.ComponentName, boolean);

    method @NonNull public String[] setPackagesSuspended(@NonNull android.content.ComponentName, @NonNull String[], boolean);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, conditional=true) public void setPasswordExpirationTimeout(@Nullable android.content.ComponentName, long);
@@ -7966,7 +7966,7 @@ package android.app.admin { 
    method @Deprecated public void setPasswordMinimumSymbols(@NonNull android.content.ComponentName, int);

    method @Deprecated public void setPasswordMinimumUpperCase(@NonNull android.content.ComponentName, int);

    method @Deprecated public void setPasswordQuality(@NonNull android.content.ComponentName, int);

    method public boolean setPermissionGrantState(@NonNull android.content.ComponentName, @NonNull String, @NonNull String, int);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS, conditional=true) public boolean setPermissionGrantState(@Nullable android.content.ComponentName, @NonNull String, @NonNull String, int);

    method public void setPermissionPolicy(@NonNull android.content.ComponentName, int);

    method public boolean setPermittedAccessibilityServices(@NonNull android.content.ComponentName, java.util.List<java.lang.String>);

    method public boolean setPermittedCrossProfileNotificationListeners(@NonNull android.content.ComponentName, @Nullable java.util.List<java.lang.String>);
@@ -7984,18 +7984,18 @@ package android.app.admin { 
    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_SCREEN_CAPTURE, conditional=true) public void setScreenCaptureDisabled(@Nullable android.content.ComponentName, boolean);

    method public void setSecureSetting(@NonNull android.content.ComponentName, String, String);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_SECURITY_LOGGING, conditional=true) public void setSecurityLoggingEnabled(@Nullable android.content.ComponentName, boolean);

    method public void setShortSupportMessage(@NonNull android.content.ComponentName, @Nullable CharSequence);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE, conditional=true) public void setShortSupportMessage(@Nullable android.content.ComponentName, @Nullable CharSequence);

    method public void setStartUserSessionMessage(@NonNull android.content.ComponentName, @Nullable CharSequence);

    method public boolean setStatusBarDisabled(@NonNull android.content.ComponentName, boolean);

    method @Deprecated public int setStorageEncryption(@NonNull android.content.ComponentName, boolean);

    method public void setSystemSetting(@NonNull android.content.ComponentName, @NonNull String, String);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_SYSTEM_UPDATES, conditional=true) public void setSystemUpdatePolicy(@NonNull android.content.ComponentName, android.app.admin.SystemUpdatePolicy);

    method @RequiresPermission(value=android.Manifest.permission.SET_TIME, conditional=true) public boolean setTime(@NonNull android.content.ComponentName, long);

    method @RequiresPermission(value=android.Manifest.permission.SET_TIME_ZONE, conditional=true) public boolean setTimeZone(@NonNull android.content.ComponentName, String);

    method @RequiresPermission(value=android.Manifest.permission.SET_TIME, conditional=true) public boolean setTime(@Nullable android.content.ComponentName, long);

    method @RequiresPermission(value=android.Manifest.permission.SET_TIME_ZONE, conditional=true) public boolean setTimeZone(@Nullable android.content.ComponentName, String);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_KEYGUARD, conditional=true) public void setTrustAgentConfiguration(@Nullable android.content.ComponentName, @NonNull android.content.ComponentName, android.os.PersistableBundle);

    method public void setUninstallBlocked(@Nullable android.content.ComponentName, String, boolean);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_APPS_CONTROL, conditional=true) public void setUninstallBlocked(@Nullable android.content.ComponentName, String, boolean);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING, conditional=true) public void setUsbDataSignalingEnabled(boolean);

    method public void setUserControlDisabledPackages(@NonNull android.content.ComponentName, @NonNull java.util.List<java.lang.String>);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_APPS_CONTROL, conditional=true) public void setUserControlDisabledPackages(@Nullable android.content.ComponentName, @NonNull java.util.List<java.lang.String>);

    method public void setUserIcon(@NonNull android.content.ComponentName, android.graphics.Bitmap);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_WIFI, conditional=true) public void setWifiSsidPolicy(@Nullable android.app.admin.WifiSsidPolicy);

    method public int startUserInBackground(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle);
@@ -8005,9 +8005,9 @@ package android.app.admin { 
    method public void uninstallAllUserCaCerts(@Nullable android.content.ComponentName);

    method public void uninstallCaCert(@Nullable android.content.ComponentName, byte[]);

    method public boolean updateOverrideApn(@NonNull android.content.ComponentName, int, @NonNull android.telephony.data.ApnSetting);

    method public void wipeData(int);

    method public void wipeData(int, @NonNull CharSequence);

    method public void wipeDevice(int);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_WIPE_DATA, conditional=true) public void wipeData(int);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_WIPE_DATA, conditional=true) public void wipeData(int, @NonNull CharSequence);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_WIPE_DATA, conditional=true) public void wipeDevice(int);

    field public static final String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN";

    field public static final String ACTION_ADMIN_POLICY_COMPLIANCE = "android.app.action.ADMIN_POLICY_COMPLIANCE";

    field public static final String ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED = "android.app.action.APPLICATION_DELEGATION_SCOPES_CHANGED";

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

+186 −109

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/admin/IDevicePolicyManager.aidl

+19 −19
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ interface IDevicePolicyManager { 
    /**

    * @param factoryReset only applicable when `targetSdk >= U`, either tries to factoryReset/fail or removeUser/fail otherwise

    **/

    void wipeDataWithReason(int flags, String wipeReasonForUser, boolean parent, boolean factoryReset);

    void wipeDataWithReason(String callerPackageName, int flags, String wipeReasonForUser, boolean parent, boolean factoryReset);



    void setFactoryResetProtectionPolicy(in ComponentName who, String callerPackageName, in FactoryResetProtectionPolicy policy);

    FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(in ComponentName who);
@@ -143,7 +143,7 @@ interface IDevicePolicyManager { 
    boolean requestBugreport(in ComponentName who);



    void setCameraDisabled(in ComponentName who, String callerPackageName, boolean disabled, boolean parent);

    boolean getCameraDisabled(in ComponentName who, int userHandle, boolean parent);

    boolean getCameraDisabled(in ComponentName who, String callerPackageName, int userHandle, boolean parent);



    void setScreenCaptureDisabled(

        in ComponentName who, String callerPackageName, boolean disabled, boolean parent);
@@ -235,8 +235,8 @@ interface IDevicePolicyManager { 
    boolean isAlwaysOnVpnLockdownEnabledForUser(int userHandle);

    List<String> getAlwaysOnVpnLockdownAllowlist(in ComponentName who);



    void addPersistentPreferredActivity(in ComponentName admin, in IntentFilter filter, in ComponentName activity);

    void clearPackagePersistentPreferredActivities(in ComponentName admin, String packageName);

    void addPersistentPreferredActivity(in ComponentName admin, String callerPackageName, in IntentFilter filter, in ComponentName activity);

    void clearPackagePersistentPreferredActivities(in ComponentName admin, String callerPackageName, String packageName);



    void setDefaultSmsApplication(in ComponentName admin, String packageName, boolean parent);

    void setDefaultDialerApplication(String packageName);
@@ -304,12 +304,12 @@ interface IDevicePolicyManager { 
            in List<PreferentialNetworkServiceConfig> preferentialNetworkServiceConfigs);

    List<PreferentialNetworkServiceConfig> getPreferentialNetworkServiceConfigs();



    void setLockTaskPackages(in ComponentName who, in String[] packages);

    String[] getLockTaskPackages(in ComponentName who);

    void setLockTaskPackages(in ComponentName who, String callerPackageName, in String[] packages);

    String[] getLockTaskPackages(in ComponentName who, String callerPackageName);

    boolean isLockTaskPermitted(in String pkg);



    void setLockTaskFeatures(in ComponentName who, int flags);

    int getLockTaskFeatures(in ComponentName who);

    void setLockTaskFeatures(in ComponentName who, String callerPackageName, int flags);

    int getLockTaskFeatures(in ComponentName who, String callerPackageName);



    void setGlobalSetting(in ComponentName who, in String setting, in String value);

    void setSystemSetting(in ComponentName who, in String setting, in String value);
@@ -320,8 +320,8 @@ interface IDevicePolicyManager { 


    void setLocationEnabled(in ComponentName who, boolean locationEnabled);



    boolean setTime(in ComponentName who, long millis);

    boolean setTimeZone(in ComponentName who, String timeZone);

    boolean setTime(in ComponentName who, String callerPackageName, long millis);

    boolean setTimeZone(in ComponentName who, String callerPackageName, String timeZone);



    void setMasterVolumeMuted(in ComponentName admin, boolean on);

    boolean isMasterVolumeMuted(in ComponentName admin);
@@ -329,7 +329,7 @@ interface IDevicePolicyManager { 
    void notifyLockTaskModeChanged(boolean isEnabled, String pkg, int userId);



    void setUninstallBlocked(in ComponentName admin, in String callerPackage, in String packageName, boolean uninstallBlocked);

    boolean isUninstallBlocked(in ComponentName admin, in String packageName);

    boolean isUninstallBlocked(in String packageName);



    void setCrossProfileCallerIdDisabled(in ComponentName who, boolean disabled);

    boolean getCrossProfileCallerIdDisabled(in ComponentName who);
@@ -366,11 +366,11 @@ interface IDevicePolicyManager { 
    void setAutoTimeRequired(in ComponentName who, boolean required);

    boolean getAutoTimeRequired();



    void setAutoTimeEnabled(in ComponentName who, boolean enabled);

    boolean getAutoTimeEnabled(in ComponentName who);

    void setAutoTimeEnabled(in ComponentName who, String callerPackageName, boolean enabled);

    boolean getAutoTimeEnabled(in ComponentName who, String callerPackageName);



    void setAutoTimeZoneEnabled(in ComponentName who, boolean enabled);

    boolean getAutoTimeZoneEnabled(in ComponentName who);

    void setAutoTimeZoneEnabled(in ComponentName who, String callerPackageName, boolean enabled);

    boolean getAutoTimeZoneEnabled(in ComponentName who, String callerPackageName);



    void setForceEphemeralUsers(in ComponentName who, boolean forceEpehemeralUsers);

    boolean getForceEphemeralUsers(in ComponentName who);
@@ -404,8 +404,8 @@ interface IDevicePolicyManager { 
    String getWifiMacAddress(in ComponentName admin, String callerPackageName);

    void reboot(in ComponentName admin);



    void setShortSupportMessage(in ComponentName admin, in CharSequence message);

    CharSequence getShortSupportMessage(in ComponentName admin);

    void setShortSupportMessage(in ComponentName admin, String callerPackageName, in CharSequence message);

    CharSequence getShortSupportMessage(in ComponentName admin, String callerPackageName);

    void setLongSupportMessage(in ComponentName admin, in CharSequence message);

    CharSequence getLongSupportMessage(in ComponentName admin);
@@ -528,9 +528,9 @@ interface IDevicePolicyManager { 
    boolean setKeyGrantToWifiAuth(String callerPackage, String alias, boolean hasGrant);

    boolean isKeyPairGrantedToWifiAuth(String callerPackage, String alias);



    void setUserControlDisabledPackages(in ComponentName admin, in List<String> packages);

    void setUserControlDisabledPackages(in ComponentName admin, String callerPackageName, in List<String> packages);



    List<String> getUserControlDisabledPackages(in ComponentName admin);

    List<String> getUserControlDisabledPackages(in ComponentName admin, String callerPackageName);



    void setCommonCriteriaModeEnabled(in ComponentName admin, boolean enabled);

    boolean isCommonCriteriaModeEnabled(in ComponentName admin);

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+333 −200

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+1 −2
Original line number Diff line number Diff line
@@ -2775,8 +2775,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        // Can't set message for admin in another uid.

        {

            mContext.binder.callingUid = DpmMockContext.CALLER_UID + 1;

            assertExpectException(SecurityException.class,

                    /* messageRegex= */ "is not owned by uid",

            assertThrows(SecurityException.class,

                    () -> dpm.setShortSupportMessage(admin1, "Some text"));

            mContext.binder.callingUid = DpmMockContext.CALLER_UID;

        }