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

Commit 2a94b582 authored by Jonathan Scott's avatar Jonathan Scott
Browse files

Add permission access to DPM Apis. 

Test: btest a.d.c.ScreenCaptureDisabledTest
Test: btest a.d.c.SystemUpdateTest
Test: btest a.d.c.WifiTest
Test: btest a.d.c.SecurityLoggingTest
Bug: 234609037
Change-Id: Ic68bfdeb9bde90779696101f58ace67bba543a46
parent c366288a

core/api/current.txt

+13 −13
Original line number Diff line number Diff line
@@ -7886,8 +7886,8 @@ package android.app.admin { 
    method @NonNull public java.util.List<java.lang.String> getUserControlDisabledPackages(@NonNull 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(@NonNull android.content.ComponentName);

    method @Nullable public android.app.admin.WifiSsidPolicy getWifiSsidPolicy();

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

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

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

    method public boolean grantKeyPairToWifiAuth(@NonNull String);

    method public boolean hasCaCertInstalled(@Nullable android.content.ComponentName, byte[]);
@@ -7899,7 +7899,7 @@ package android.app.admin { 
    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 public void installSystemUpdate(@NonNull android.content.ComponentName, @NonNull android.net.Uri, @NonNull java.util.concurrent.Executor, @NonNull android.app.admin.DevicePolicyManager.InstallSystemUpdateCallback);

    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 public boolean isActivePasswordSufficientForDeviceRequirement();

    method public boolean isAdminActive(@NonNull android.content.ComponentName);
@@ -7927,7 +7927,7 @@ package android.app.admin { 
    method public boolean isProvisioningAllowed(@NonNull String);

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

    method public boolean isSafeOperation(int);

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

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

    method public boolean isStatusBarDisabled();

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

    method public boolean isUniqueDeviceAttestationSupported();
@@ -7947,8 +7947,8 @@ package android.app.admin { 
    method @Deprecated public boolean resetPassword(String, int);

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

    method @Nullable public java.util.List<android.app.admin.NetworkEvent> retrieveNetworkLogs(@Nullable android.content.ComponentName, long);

    method @Nullable public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrievePreRebootSecurityLogs(@NonNull android.content.ComponentName);

    method @Nullable public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrieveSecurityLogs(@NonNull android.content.ComponentName);

    method @Nullable @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_SECURITY_LOGGING, conditional=true) public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrievePreRebootSecurityLogs(@Nullable android.content.ComponentName);

    method @Nullable @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_SECURITY_LOGGING, conditional=true) public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrieveSecurityLogs(@Nullable android.content.ComponentName);

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

    method public boolean revokeKeyPairFromWifiAuth(@NonNull String);

    method public void setAccountManagementDisabled(@NonNull android.content.ComponentName, String, boolean);
@@ -7994,10 +7994,10 @@ package android.app.admin { 
    method public void setManagedProfileMaximumTimeOff(@NonNull android.content.ComponentName, long);

    method public void setManagedSubscriptionsPolicy(@Nullable android.app.admin.ManagedSubscriptionsPolicy);

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

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

    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 @NonNull public java.util.List<java.lang.String> setMeteredDataDisabledPackages(@NonNull android.content.ComponentName, @NonNull java.util.List<java.lang.String>);

    method public void setMinimumRequiredWifiSecurityLevel(int);

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

    method public void setMtePolicy(int);

    method public void setNearbyAppStreamingPolicy(int);

    method public void setNearbyNotificationStreamingPolicy(int);
@@ -8032,23 +8032,23 @@ package android.app.admin { 
    method public void setRequiredStrongAuthTimeout(@NonNull 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 public void setScreenCaptureDisabled(@NonNull android.content.ComponentName, boolean);

    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 public void setSecurityLoggingEnabled(@NonNull android.content.ComponentName, boolean);

    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 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 public void setSystemUpdatePolicy(@NonNull android.content.ComponentName, android.app.admin.SystemUpdatePolicy);

    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 public void setUninstallBlocked(@Nullable android.content.ComponentName, String, boolean);

    method public void setUsbDataSignalingEnabled(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 public void setUserIcon(@NonNull android.content.ComponentName, android.graphics.Bitmap);

    method public void setWifiSsidPolicy(@Nullable android.app.admin.WifiSsidPolicy);

    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);

    method public int stopUser(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle);

    method public boolean switchUser(@NonNull android.content.ComponentName, @Nullable android.os.UserHandle);

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

+132 −87

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −7
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ interface IDevicePolicyManager { 
    int getCurrentFailedPasswordAttempts(int userHandle, boolean parent);

    int getProfileWithMinimumFailedPasswordsForWipe(int userHandle, boolean parent);



    void setMaximumFailedPasswordsForWipe(in ComponentName admin, int num, boolean parent);

    void setMaximumFailedPasswordsForWipe(

        in ComponentName admin, String callerPackageName, int num, boolean parent);

    int getMaximumFailedPasswordsForWipe(in ComponentName admin, int userHandle, boolean parent);



    boolean resetPassword(String password, int flags);
@@ -144,7 +145,8 @@ interface IDevicePolicyManager { 
    void setCameraDisabled(in ComponentName who, String callerPackageName, boolean disabled, boolean parent);

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



    void setScreenCaptureDisabled(in ComponentName who, boolean disabled, boolean parent);

    void setScreenCaptureDisabled(

        in ComponentName who, String callerPackageName, boolean disabled, boolean parent);

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



    void setNearbyNotificationStreamingPolicy(int policy);
@@ -376,7 +378,7 @@ interface IDevicePolicyManager { 


    void setUserIcon(in ComponentName admin, in Bitmap icon);



    void setSystemUpdatePolicy(in ComponentName who, in SystemUpdatePolicy policy);

    void setSystemUpdatePolicy(in ComponentName who, String callerPackageName, in SystemUpdatePolicy policy);

    SystemUpdatePolicy getSystemUpdatePolicy();

    void clearSystemUpdatePolicyFreezePeriodRecord();
@@ -398,7 +400,7 @@ interface IDevicePolicyManager { 
    void setKeepUninstalledPackages(in ComponentName admin, in String callerPackage, in List<String> packageList);

    List<String> getKeepUninstalledPackages(in ComponentName admin, in String callerPackage);

    boolean isManagedProfile(in ComponentName admin);

    String getWifiMacAddress(in ComponentName admin);

    String getWifiMacAddress(in ComponentName admin, String callerPackageName);

    void reboot(in ComponentName admin);



    void setShortSupportMessage(in ComponentName admin, in CharSequence message);
@@ -502,7 +504,7 @@ interface IDevicePolicyManager { 


    void setProfileOwnerOnOrganizationOwnedDevice(in ComponentName who, int userId, boolean isProfileOwnerOnOrganizationOwnedDevice);



    void installUpdateFromFile(in ComponentName admin, in ParcelFileDescriptor updateFileDescriptor, in StartInstallingUpdateCallback listener);

    void installUpdateFromFile(in ComponentName admin, String callerPackageName, in ParcelFileDescriptor updateFileDescriptor, in StartInstallingUpdateCallback listener);



    void setCrossProfileCalendarPackages(in ComponentName admin, in List<String> packageNames);

    List<String> getCrossProfileCalendarPackages(in ComponentName admin);
@@ -565,10 +567,10 @@ interface IDevicePolicyManager { 
    boolean isUsbDataSignalingEnabledForUser(int userId);

    boolean canUsbDataSignalingBeDisabled();



    void setMinimumRequiredWifiSecurityLevel(int level);

    void setMinimumRequiredWifiSecurityLevel(String callerPackageName, int level);

    int getMinimumRequiredWifiSecurityLevel();



    void setWifiSsidPolicy(in WifiSsidPolicy policy);

    void setWifiSsidPolicy(String callerPackageName, in WifiSsidPolicy policy);

    WifiSsidPolicy getWifiSsidPolicy();



    List<UserHandle> listForegroundAffiliatedUsers();

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

+266 −107

File changed.

Preview size limit exceeded, changes collapsed.