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

Commit dd1a75b5 authored by Jonathan Scott's avatar Jonathan Scott
Browse files

Add DPM Permissions 3. 

Test: btest a.d.c.PermitInputMethodsTest
Test: btest a.d.c.KeyguardTest
Test: btest a.d.c.LockTest
Test: btest a.d.c.FactoryResetTest
Bug: 234609037
Change-Id: Id6a35acb9e88fcff44772011e41d63baa8ec8e31
parent 96c43ae8

core/api/current.txt

+9 −9
Original line number Diff line number Diff line
@@ -7825,7 +7825,7 @@ package android.app.admin { 
    method @Nullable public String getDevicePolicyManagementRoleHolderPackage();

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

    method @NonNull public String getEnrollmentSpecificId();

    method @Nullable public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName);

    method @Nullable @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_FACTORY_RESET, conditional=true) public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName);

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

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

    method @NonNull public java.util.List<byte[]> getInstalledCaCerts(@Nullable android.content.ComponentName);
@@ -7868,7 +7868,7 @@ package android.app.admin { 
    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);

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

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

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

    method @NonNull public java.util.List<android.app.admin.PreferentialNetworkServiceConfig> getPreferentialNetworkServiceConfigs();

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, conditional=true) public int getRequiredPasswordComplexity();
@@ -7934,8 +7934,8 @@ package android.app.admin { 
    method public boolean isUsbDataSignalingEnabled();

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

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

    method public void lockNow();

    method public void lockNow(int);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK, conditional=true) public void lockNow();

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

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

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

    method public void removeActiveAdmin(@NonNull android.content.ComponentName);
@@ -7976,14 +7976,14 @@ package android.app.admin { 
    method public void setDelegatedScopes(@NonNull android.content.ComponentName, @NonNull String, @NonNull java.util.List<java.lang.String>);

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

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

    method public void setFactoryResetProtectionPolicy(@NonNull android.content.ComponentName, @Nullable android.app.admin.FactoryResetProtectionPolicy);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_FACTORY_RESET, conditional=true) public void setFactoryResetProtectionPolicy(@Nullable android.content.ComponentName, @Nullable android.app.admin.FactoryResetProtectionPolicy);

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

    method @WorkerThread public int setGlobalPrivateDnsModeSpecifiedHost(@NonNull android.content.ComponentName, @NonNull String);

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

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

    method public boolean setKeyPairCertificate(@Nullable android.content.ComponentName, @NonNull String, @NonNull java.util.List<java.security.cert.Certificate>, boolean);

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

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

    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;
@@ -7995,7 +7995,7 @@ package android.app.admin { 
    method public void setManagedSubscriptionsPolicy(@Nullable android.app.admin.ManagedSubscriptionsPolicy);

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

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

    method public void setMaximumTimeToLock(@NonNull android.content.ComponentName, long);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK, conditional=true) public void setMaximumTimeToLock(@Nullable android.content.ComponentName, long);

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

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

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_MTE, conditional=true) public void setMtePolicy(int);
@@ -8021,7 +8021,7 @@ package android.app.admin { 
    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>);

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

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

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

    method public void setPreferentialNetworkServiceConfigs(@NonNull java.util.List<android.app.admin.PreferentialNetworkServiceConfig>);

    method public void setPreferentialNetworkServiceEnabled(boolean);
@@ -8043,7 +8043,7 @@ package android.app.admin { 
    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 public void setTrustAgentConfiguration(@NonNull android.content.ComponentName, @NonNull android.content.ComponentName, android.os.PersistableBundle);

    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_USB_DATA_SIGNALLING, conditional=true) public void setUsbDataSignalingEnabled(boolean);

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

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

+87 −50

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −7
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ interface IDevicePolicyManager { 


    boolean resetPassword(String password, int flags);



    void setMaximumTimeToLock(in ComponentName who, long timeMs, boolean parent);

    void setMaximumTimeToLock(in ComponentName who, String callerPackageName, long timeMs, boolean parent);

    long getMaximumTimeToLock(in ComponentName who, int userHandle, boolean parent);



    void setRequiredStrongAuthTimeout(in ComponentName who, String callerPackageName, long timeMs, boolean parent);
@@ -126,7 +126,7 @@ interface IDevicePolicyManager { 
    **/

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



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

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

    FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(in ComponentName who);

    boolean isFactoryResetProtectionPolicySupported();
@@ -155,7 +155,7 @@ interface IDevicePolicyManager { 
    void setNearbyAppStreamingPolicy(int policy);

    int getNearbyAppStreamingPolicy(int userId);



    void setKeyguardDisabledFeatures(in ComponentName who, int which, boolean parent);

    void setKeyguardDisabledFeatures(in ComponentName who, String callerPackageName, int which, boolean parent);

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



    void setActiveAdmin(in ComponentName policyReceiver, boolean refreshing, int userHandle);
@@ -262,8 +262,8 @@ interface IDevicePolicyManager { 
    List<String> getPermittedAccessibilityServicesForUser(int userId);

    boolean isAccessibilityServicePermittedByAdmin(in ComponentName admin, String packageName, int userId);



    boolean setPermittedInputMethods(in ComponentName admin,in List<String> packageList, boolean parent);

    List<String> getPermittedInputMethods(in ComponentName admin, boolean parent);

    boolean setPermittedInputMethods(in ComponentName admin, String callerPackageName, in List<String> packageList, boolean parent);

    List<String> getPermittedInputMethods(in ComponentName admin, String callerPackageName, boolean parent);

    List<String> getPermittedInputMethodsAsUser(int userId);

    boolean isInputMethodPermittedByAdmin(in ComponentName admin, String packageName, int userId, boolean parent);
@@ -353,8 +353,8 @@ interface IDevicePolicyManager { 
    boolean getBluetoothContactSharingDisabled(in ComponentName who);

    boolean getBluetoothContactSharingDisabledForUser(int userId);



    void setTrustAgentConfiguration(in ComponentName admin, in ComponentName agent,

            in PersistableBundle args, boolean parent);

    void setTrustAgentConfiguration(in ComponentName admin, String callerPackageName,

            in ComponentName agent, in PersistableBundle args, boolean parent);

    List<PersistableBundle> getTrustAgentConfiguration(in ComponentName admin,

            in ComponentName agent, int userId, boolean parent);

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

+217 −73

File changed.

Preview size limit exceeded, changes collapsed.