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

Commit 96c43ae8 authored by Jonathan Scott's avatar Jonathan Scott
Browse files

Add permissions to DPM 2. 

Test: btest a.d.c.MtePolicyTest
Test: btest a.d.c.PasswordTest
Test: btest a.d.c.PasswordComplexityTest
Test: btest a.d.c.ApplicationHiddenTest
Test: btest a.d.c.WifiTest
Bug: 234609037
Change-Id: I090ee7eee6e1c7a1e746232a961e37ec55ae942b
parent 2a94b582

core/api/current.txt

+13 −13
Original line number Diff line number Diff line
@@ -7818,7 +7818,7 @@ package android.app.admin { 
    method @Deprecated public boolean getCrossProfileContactsSearchDisabled(@NonNull android.content.ComponentName);

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

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

    method public int getCurrentFailedPasswordAttempts();

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

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

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

    method public CharSequence getDeviceOwnerLockScreenInfo();
@@ -7843,14 +7843,14 @@ package android.app.admin { 
    method public long getMaximumTimeToLock(@Nullable android.content.ComponentName);

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

    method public int getMinimumRequiredWifiSecurityLevel();

    method public int getMtePolicy();

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

    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 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(android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY) public int getPasswordComplexity();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY}, conditional=true) public int getPasswordComplexity();

    method public long getPasswordExpiration(@Nullable android.content.ComponentName);

    method public long getPasswordExpirationTimeout(@Nullable android.content.ComponentName);

    method public int getPasswordHistoryLength(@Nullable android.content.ComponentName);
@@ -7871,7 +7871,7 @@ package android.app.admin { 
    method @Nullable public java.util.List<java.lang.String> getPermittedInputMethods(@NonNull android.content.ComponentName);

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

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

    method public int getRequiredPasswordComplexity();

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

    method public long getRequiredStrongAuthTimeout(@Nullable android.content.ComponentName);

    method @NonNull public android.app.admin.DevicePolicyResourcesManager getResources();

    method public boolean getScreenCaptureDisabled(@Nullable android.content.ComponentName);
@@ -7893,19 +7893,19 @@ package android.app.admin { 
    method public boolean hasCaCertInstalled(@Nullable android.content.ComponentName, byte[]);

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

    method public boolean hasKeyPair(@NonNull String);

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

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

    method public boolean installCaCert(@Nullable android.content.ComponentName, byte[]);

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

    method public boolean installKeyPair(@Nullable android.content.ComponentName, @NonNull java.security.PrivateKey, @NonNull java.security.cert.Certificate, @NonNull String);

    method public boolean installKeyPair(@Nullable android.content.ComponentName, @NonNull java.security.PrivateKey, @NonNull java.security.cert.Certificate[], @NonNull String, boolean);

    method public boolean installKeyPair(@Nullable android.content.ComponentName, @NonNull java.security.PrivateKey, @NonNull java.security.cert.Certificate[], @NonNull String, int);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_SYSTEM_UPDATES, conditional=true) public void installSystemUpdate(@Nullable android.content.ComponentName, @NonNull android.net.Uri, @NonNull java.util.concurrent.Executor, @NonNull android.app.admin.DevicePolicyManager.InstallSystemUpdateCallback);

    method public boolean isActivePasswordSufficient();

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, conditional=true) public boolean isActivePasswordSufficient();

    method public boolean isActivePasswordSufficientForDeviceRequirement();

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

    method public boolean isAffiliatedUser();

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

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

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

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

    method @Deprecated public boolean isCallerApplicationRestrictionsManagingPackage();

    method public boolean isCommonCriteriaModeEnabled(@Nullable android.content.ComponentName);
@@ -7955,7 +7955,7 @@ package android.app.admin { 
    method public void setAffiliationIds(@NonNull android.content.ComponentName, @NonNull java.util.Set<java.lang.String>);

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

    method public void setAlwaysOnVpnPackage(@NonNull android.content.ComponentName, @Nullable String, boolean, @Nullable java.util.Set<java.lang.String>) throws android.content.pm.PackageManager.NameNotFoundException;

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

    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);
@@ -7966,7 +7966,7 @@ package android.app.admin { 
    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_CAMERA, conditional=true) public void setCameraDisabled(@Nullable android.content.ComponentName, boolean);

    method @Deprecated public void setCertInstallerPackage(@NonNull android.content.ComponentName, @Nullable String) throws java.lang.SecurityException;

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

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

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

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

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

    method @Deprecated public void setCrossProfileCallerIdDisabled(@NonNull android.content.ComponentName, boolean);
@@ -7998,7 +7998,7 @@ package android.app.admin { 
    method public void setMaximumTimeToLock(@NonNull 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 public void setMtePolicy(int);

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

    method public void setNearbyAppStreamingPolicy(int);

    method public void setNearbyNotificationStreamingPolicy(int);

    method public void setNetworkLoggingEnabled(@Nullable android.content.ComponentName, boolean);
@@ -8007,7 +8007,7 @@ package android.app.admin { 
    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY) 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 public void setPasswordExpirationTimeout(@NonNull android.content.ComponentName, long);

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

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

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

    method @Deprecated public void setPasswordMinimumLetters(@NonNull android.content.ComponentName, int);
@@ -8028,8 +8028,8 @@ package android.app.admin { 
    method public void setProfileEnabled(@NonNull android.content.ComponentName);

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

    method public void setRecommendedGlobalProxy(@NonNull android.content.ComponentName, @Nullable android.net.ProxyInfo);

    method public void setRequiredPasswordComplexity(int);

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

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

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

    method public boolean setResetPasswordToken(android.content.ComponentName, byte[]);

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

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

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

+93 −54

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −6
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ interface IDevicePolicyManager { 
    void setPasswordHistoryLength(in ComponentName who, int length, boolean parent);

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



    void setPasswordExpirationTimeout(in ComponentName who, long expiration, boolean parent);

    void setPasswordExpirationTimeout(in ComponentName who, String callerPackageName, long expiration, boolean parent);

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



    long getPasswordExpiration(in ComponentName who, int userHandle, boolean parent);
@@ -100,7 +100,7 @@ interface IDevicePolicyManager { 
    boolean isActivePasswordSufficientForDeviceRequirement();

    boolean isPasswordSufficientAfterProfileUnification(int userHandle, int profileUser);

    int getPasswordComplexity(boolean parent);

    void setRequiredPasswordComplexity(int passwordComplexity, boolean parent);

    void setRequiredPasswordComplexity(String callerPackageName, int passwordComplexity, boolean parent);

    int getRequiredPasswordComplexity(boolean parent);

    int getAggregatedPasswordComplexityForUser(int userId, boolean deviceWideOnly);

    boolean isUsingUnifiedPassword(in ComponentName admin);
@@ -116,7 +116,7 @@ interface IDevicePolicyManager { 
    void setMaximumTimeToLock(in ComponentName who, long timeMs, boolean parent);

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



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

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

    long getRequiredStrongAuthTimeout(in ComponentName who, int userId, boolean parent);



    void lockNow(int flags, boolean parent);
@@ -314,7 +314,7 @@ interface IDevicePolicyManager { 
    void setSystemSetting(in ComponentName who, in String setting, in String value);

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



    void setConfiguredNetworksLockdownState(in ComponentName who, boolean lockdown);

    void setConfiguredNetworksLockdownState(in ComponentName who, String callerPackageName, boolean lockdown);

    boolean hasLockdownAdminConfiguredNetworks(in ComponentName who);



    void setLocationEnabled(in ComponentName who, boolean locationEnabled);
@@ -593,8 +593,8 @@ interface IDevicePolicyManager { 
    void setApplicationExemptions(String packageName, in int[]exemptions);

    int[] getApplicationExemptions(String packageName);



    void setMtePolicy(int flag);

    int getMtePolicy();

    void setMtePolicy(int flag, String callerPackageName);

    int getMtePolicy(String callerPackageName);



    void setManagedSubscriptionsPolicy(in ManagedSubscriptionsPolicy policy);

    ManagedSubscriptionsPolicy getManagedSubscriptionsPolicy();

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

+208 −78

File changed.

Preview size limit exceeded, changes collapsed.