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

Commit 0d808862 authored by Elis Elliott's avatar Elis Elliott
Browse files

Add permission checks for some APIs needed for Lightweight. 

Bug: 234609037

Test: btest CtsDevicePolicyTestCases
Change-Id: I8084d01ad13beb9c144889db140c3ccf963dcb00
parent 64ee685f

core/api/current.txt

+16 −16
Original line number Diff line number Diff line
@@ -7725,8 +7725,8 @@ package android.app.admin { 














  public class DevicePolicyManager {















    method public void acknowledgeDeviceCompliant();













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













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













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













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















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















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









@@ -7735,11 +7735,11 @@ package android.app.admin {













    method public boolean canAdminGrantSensorsPermissions();















    method public boolean canUsbDataSignalingBeDisabled();















    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 @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_PROFILE_INTERACTION, conditional=true) public void clearCrossProfileIntentFilters(@Nullable android.content.ComponentName);















    method @Deprecated public void clearDeviceOwnerApp(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 @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_RESET_PASSWORD, conditional=true) public boolean clearResetPasswordToken(@Nullable android.content.ComponentName);















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















    method public android.content.Intent createAdminSupportIntent(@NonNull String);















    method @Nullable public android.os.UserHandle createAndManageUser(@NonNull android.content.ComponentName, @NonNull String, @NonNull android.content.ComponentName, @Nullable android.os.PersistableBundle, int);









@@ -7758,14 +7758,14 @@ package android.app.admin {













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













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















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















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















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















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















    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 @NonNull @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_PROFILE_INTERACTION, conditional=true) public java.util.List<java.lang.String> getCrossProfileWidgetProviders(@Nullable android.content.ComponentName);















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










@@ -7869,11 +7869,11 @@ package android.app.admin {













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















    method public boolean isOrganizationOwnedDeviceWithManagedProfile();















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













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













    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_PACKAGE_STATE, conditional=true) public boolean isPackageSuspended(@Nullable android.content.ComponentName, String) throws android.content.pm.PackageManager.NameNotFoundException;















    method public boolean isPreferentialNetworkServiceEnabled();















    method public boolean isProfileOwnerApp(String);















    method public boolean isProvisioningAllowed(@NonNull String);













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













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















    method public boolean isSafeOperation(int);















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















    method public boolean isStatusBarDisabled();









@@ -7887,19 +7887,19 @@ package android.app.admin {













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















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















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













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













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















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















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















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















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















    method @Deprecated public boolean resetPassword(String, int);













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













    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_RESET_PASSWORD, conditional=true) public boolean resetPasswordWithToken(@Nullable android.content.ComponentName, String, byte[], int);















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















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













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















    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;









@@ -7913,7 +7913,7 @@ package android.app.admin {













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















    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 @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE, conditional=true) public void setCommonCriteriaModeEnabled(@Nullable 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>);









@@ -7921,7 +7921,7 @@ package android.app.admin {













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















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















    method public void setDefaultDialerApplication(@NonNull String);













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













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















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










@@ -7955,7 +7955,7 @@ package android.app.admin {













    method public void setOrganizationId(@NonNull String);















    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 @NonNull @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_PACKAGE_STATE, conditional=true) public String[] setPackagesSuspended(@Nullable 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);















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















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









@@ -7979,14 +7979,14 @@ package android.app.admin {













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















    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 @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_RESET_PASSWORD, conditional=true) public boolean setResetPasswordToken(@Nullable 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);















    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 @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 @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_STATUS_BAR, conditional=true) public boolean setStatusBarDisabled(@Nullable 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);

























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



+206
−108


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+15
−15




























Original line number
Diff line number
Diff line








@@ -238,7 +238,7 @@ interface IDevicePolicyManager {













    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 setDefaultSmsApplication(in ComponentName admin, String callerPackageName, String packageName, boolean parent);















    void setDefaultDialerApplication(String packageName);































    void setApplicationRestrictions(in ComponentName who, in String callerPackage, in String packageName, in Bundle settings);









@@ -255,8 +255,8 @@ interface IDevicePolicyManager {













    Bundle getUserRestrictions(in ComponentName who, in String callerPackage, boolean parent);















    Bundle getUserRestrictionsGlobally(in String callerPackage);





























    void addCrossProfileIntentFilter(in ComponentName admin, in IntentFilter filter, int flags);













    void clearCrossProfileIntentFilters(in ComponentName admin);













    void addCrossProfileIntentFilter(in ComponentName admin, String callerPackageName, in IntentFilter filter, int flags);













    void clearCrossProfileIntentFilters(in ComponentName admin, String callerPackageName);































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















    List<String> getPermittedAccessibilityServices(in ComponentName admin);










@@ -293,9 +293,9 @@ interface IDevicePolicyManager {













    int enableSystemAppWithIntent(in ComponentName admin, in String callerPackage, in Intent intent);















    boolean installExistingPackage(in ComponentName admin, in String callerPackage, in String packageName);





























    void setAccountManagementDisabled(in ComponentName who, in String accountType, in boolean disabled, in boolean parent);













    String[] getAccountTypesWithManagementDisabled();













    String[] getAccountTypesWithManagementDisabledAsUser(int userId, in boolean parent);













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













    String[] getAccountTypesWithManagementDisabled(String callerPackageName);













    String[] getAccountTypesWithManagementDisabledAsUser(int userId, String callerPackageName, in boolean parent);































    void setSecondaryLockscreenEnabled(in ComponentName who, boolean enabled);















    boolean isSecondaryLockscreenEnabled(in UserHandle userHandle);










@@ -359,9 +359,9 @@ interface IDevicePolicyManager {













    List<PersistableBundle> getTrustAgentConfiguration(in ComponentName admin,















            in ComponentName agent, int userId, boolean parent);





























    boolean addCrossProfileWidgetProvider(in ComponentName admin, String packageName);













    boolean removeCrossProfileWidgetProvider(in ComponentName admin, String packageName);













    List<String> getCrossProfileWidgetProviders(in ComponentName admin);













    boolean addCrossProfileWidgetProvider(in ComponentName admin, String callerPackageName, String packageName);













    boolean removeCrossProfileWidgetProvider(in ComponentName admin, String callerPackageName, String packageName);













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































    void setAutoTimeRequired(in ComponentName who, boolean required);















    boolean getAutoTimeRequired();









@@ -384,7 +384,7 @@ interface IDevicePolicyManager {













    void clearSystemUpdatePolicyFreezePeriodRecord();































    boolean setKeyguardDisabled(in ComponentName admin, boolean disabled);













    boolean setStatusBarDisabled(in ComponentName who, boolean disabled);













    boolean setStatusBarDisabled(in ComponentName who, String callerPackageName, boolean disabled);















    boolean isStatusBarDisabled(in String callerPackage);















    boolean getDoNotAskCredentialsOnBoot();


























@@ -464,10 +464,10 @@ interface IDevicePolicyManager {













    long getLastBugReportRequestTime();















    long getLastNetworkLogRetrievalTime();





























    boolean setResetPasswordToken(in ComponentName admin, in byte[] token);













    boolean clearResetPasswordToken(in ComponentName admin);













    boolean isResetPasswordTokenActive(in ComponentName admin);













    boolean resetPasswordWithToken(in ComponentName admin, String password, in byte[] token, int flags);













    boolean setResetPasswordToken(in ComponentName admin, String callerPackageName, in byte[] token);













    boolean clearResetPasswordToken(in ComponentName admin, String callerPackageName);













    boolean isResetPasswordTokenActive(in ComponentName admin, String callerPackageName);













    boolean resetPasswordWithToken(in ComponentName admin, String callerPackageName, String password, in byte[] token, int flags);































    boolean isCurrentInputMethodSetByOwner();















    StringParceledListSlice getOwnerInstalledCaCerts(in UserHandle user);










@@ -532,7 +532,7 @@ interface IDevicePolicyManager {





























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





























    void setCommonCriteriaModeEnabled(in ComponentName admin, boolean enabled);













    void setCommonCriteriaModeEnabled(in ComponentName admin, String callerPackageName, boolean enabled);















    boolean isCommonCriteriaModeEnabled(in ComponentName admin);































    int getPersonalAppsSuspendedReasons(in ComponentName admin);

































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



+319
−130


























File changed.
Preview size limit exceeded, changes collapsed.