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

Commit 9ac2c0c5 authored by Nino Jagar's avatar Nino Jagar
Browse files

Add APIs to manage content protection device policy 

Bug: 319477846
API-Coverage-Bug: 321718961
Test: None, just built and flashed
Change-Id: I24d2beca1d5f1e7531c120e16a20e3dd28b895d8
parent 1fbbba06

core/api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -7881,6 +7881,7 @@ package android.app.admin { 
    field public static final String AUTO_TIME_POLICY = "autoTime";

    field public static final String BACKUP_SERVICE_POLICY = "backupService";

    field public static final String CAMERA_DISABLED_POLICY = "cameraDisabled";

    field @FlaggedApi("android.view.contentprotection.flags.manage_device_policy_enabled") public static final String CONTENT_PROTECTION_POLICY = "contentProtection";

    field public static final String KEYGUARD_DISABLED_FEATURES_POLICY = "keyguardDisabledFeatures";

    field public static final String LOCK_TASK_POLICY = "lockTask";

    field public static final String PACKAGES_SUSPENDED_POLICY = "packagesSuspended";
@@ -7931,6 +7932,7 @@ package android.app.admin { 
    method public boolean getBluetoothContactSharingDisabled(@NonNull 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 @FlaggedApi("android.view.contentprotection.flags.manage_device_policy_enabled") @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_CONTENT_PROTECTION, conditional=true) public int getContentProtectionPolicy(@Nullable android.content.ComponentName);

    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);
@@ -8087,6 +8089,7 @@ package android.app.admin { 
    method @Deprecated public void setCertInstallerPackage(@NonNull android.content.ComponentName, @Nullable String) throws java.lang.SecurityException;

    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 @FlaggedApi("android.view.contentprotection.flags.manage_device_policy_enabled") @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_CONTENT_PROTECTION, conditional=true) public void setContentProtectionPolicy(@Nullable android.content.ComponentName, int);

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

core/api/lint-baseline.txt

+10 −0
Original line number Diff line number Diff line
@@ -389,6 +389,12 @@ InvalidNullabilityOverride: android.media.midi.MidiUmpDeviceService#onBind(andro 
    Invalid nullability on parameter `intent` in method `onBind`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.





KotlinOperator: android.graphics.Matrix44#get(int, int):

    Method can be invoked with an indexing operator from Kotlin: `get` (this is usually desirable; just make sure it makes sense for this type of object)

KotlinOperator: android.graphics.Matrix44#set(int, int, float):

    Method can be invoked with an indexing operator from Kotlin: `set` (this is usually desirable; just make sure it makes sense for this type of object)





RequiresPermission: android.accounts.AccountManager#getAccountsByTypeAndFeatures(String, String[], android.accounts.AccountManagerCallback<android.accounts.Account[]>, android.os.Handler):

    Method 'getAccountsByTypeAndFeatures' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.accounts.AccountManager#hasFeatures(android.accounts.Account, String[], android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler):
@@ -477,6 +483,8 @@ RequiresPermission: android.app.admin.DevicePolicyManager#clearResetPasswordToke 
    Method 'clearResetPasswordToken' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#generateKeyPair(android.content.ComponentName, String, android.security.keystore.KeyGenParameterSpec, int):

    Method 'generateKeyPair' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getContentProtectionPolicy(android.content.ComponentName):

    Method 'getContentProtectionPolicy' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getCrossProfileWidgetProviders(android.content.ComponentName):

    Method 'getCrossProfileWidgetProviders' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getLockTaskFeatures(android.content.ComponentName):
@@ -513,6 +521,8 @@ RequiresPermission: android.app.admin.DevicePolicyManager#removeCrossProfileWidg 
    Method 'removeCrossProfileWidgetProvider' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setAlwaysOnVpnPackage(android.content.ComponentName, String, boolean):

    Method 'setAlwaysOnVpnPackage' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setContentProtectionPolicy(android.content.ComponentName, int):

    Method 'setContentProtectionPolicy' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setLockTaskFeatures(android.content.ComponentName, int):

    Method 'setLockTaskFeatures' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setLockTaskPackages(android.content.ComponentName, String[]):

core/api/module-lib-lint-baseline.txt

+4 −0
Original line number Diff line number Diff line
@@ -611,6 +611,8 @@ RequiresPermission: android.app.admin.DevicePolicyManager#generateKeyPair(androi 
    Method 'generateKeyPair' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getApplicationExemptions(String):

    Method 'getApplicationExemptions' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getContentProtectionPolicy(android.content.ComponentName):

    Method 'getContentProtectionPolicy' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getCrossProfileWidgetProviders(android.content.ComponentName):

    Method 'getCrossProfileWidgetProviders' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getLockTaskFeatures(android.content.ComponentName):
@@ -657,6 +659,8 @@ RequiresPermission: android.app.admin.DevicePolicyManager#setAlwaysOnVpnPackage( 
    Method 'setAlwaysOnVpnPackage' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setApplicationExemptions(String, java.util.Set<java.lang.Integer>):

    Method 'setApplicationExemptions' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setContentProtectionPolicy(android.content.ComponentName, int):

    Method 'setContentProtectionPolicy' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setDeviceProvisioningConfigApplied():

    Method 'setDeviceProvisioningConfigApplied' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setLockTaskFeatures(android.content.ComponentName, int):

core/api/system-lint-baseline.txt

+12 −4
Original line number Diff line number Diff line
@@ -525,6 +525,10 @@ KotlinKeyword: android.app.Notification#when: 
    Avoid field names that are Kotlin hard keywords ("when"); see https://android.github.io/kotlin-guides/interop.html#no-hard-keywords





KotlinOperator: android.hardware.camera2.extension.CharacteristicsMap#get(String):

    Method can be invoked with an indexing operator from Kotlin: `get` (this is usually desirable; just make sure it makes sense for this type of object)





ListenerLast: android.telephony.satellite.SatelliteManager#stopSatelliteTransmissionUpdates(android.telephony.satellite.SatelliteTransmissionUpdateCallback, java.util.concurrent.Executor, java.util.function.Consumer<java.lang.Integer>) parameter #1:

    Listeners should always be at end of argument list (method `stopSatelliteTransmissionUpdates`)

ListenerLast: android.telephony.satellite.SatelliteManager#stopSatelliteTransmissionUpdates(android.telephony.satellite.SatelliteTransmissionUpdateCallback, java.util.concurrent.Executor, java.util.function.Consumer<java.lang.Integer>) parameter #2:
@@ -685,6 +689,8 @@ RequiresPermission: android.app.admin.DevicePolicyManager#generateKeyPair(androi 
    Method 'generateKeyPair' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getApplicationExemptions(String):

    Method 'getApplicationExemptions' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getContentProtectionPolicy(android.content.ComponentName):

    Method 'getContentProtectionPolicy' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getCrossProfileWidgetProviders(android.content.ComponentName):

    Method 'getCrossProfileWidgetProviders' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#getLockTaskFeatures(android.content.ComponentName):
@@ -731,6 +737,8 @@ RequiresPermission: android.app.admin.DevicePolicyManager#setAlwaysOnVpnPackage( 
    Method 'setAlwaysOnVpnPackage' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setApplicationExemptions(String, java.util.Set<java.lang.Integer>):

    Method 'setApplicationExemptions' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setContentProtectionPolicy(android.content.ComponentName, int):

    Method 'setContentProtectionPolicy' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setDeviceProvisioningConfigApplied():

    Method 'setDeviceProvisioningConfigApplied' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.app.admin.DevicePolicyManager#setLockTaskFeatures(android.content.ComponentName, int):
@@ -2305,14 +2313,14 @@ UnflaggedApi: android.telephony.satellite.SatelliteManager.SatelliteException#Sa 
    New API must be flagged with @FlaggedApi: constructor android.telephony.satellite.SatelliteManager.SatelliteException(int)

UnflaggedApi: android.telephony.satellite.SatelliteManager.SatelliteException#getErrorCode():

    New API must be flagged with @FlaggedApi: method android.telephony.satellite.SatelliteManager.SatelliteException.getErrorCode()

UnflaggedApi: android.telephony.satellite.SatelliteProvisionStateCallback:

    New API must be flagged with @FlaggedApi: class android.telephony.satellite.SatelliteProvisionStateCallback

UnflaggedApi: android.telephony.satellite.SatelliteProvisionStateCallback#onSatelliteProvisionStateChanged(boolean):

    New API must be flagged with @FlaggedApi: method android.telephony.satellite.SatelliteProvisionStateCallback.onSatelliteProvisionStateChanged(boolean)

UnflaggedApi: android.telephony.satellite.SatelliteModemStateCallback:

    New API must be flagged with @FlaggedApi: class android.telephony.satellite.SatelliteModemStateCallback

UnflaggedApi: android.telephony.satellite.SatelliteModemStateCallback#onSatelliteModemStateChanged(int):

    New API must be flagged with @FlaggedApi: method android.telephony.satellite.SatelliteModemStateCallback.onSatelliteModemStateChanged(int)

UnflaggedApi: android.telephony.satellite.SatelliteProvisionStateCallback:

    New API must be flagged with @FlaggedApi: class android.telephony.satellite.SatelliteProvisionStateCallback

UnflaggedApi: android.telephony.satellite.SatelliteProvisionStateCallback#onSatelliteProvisionStateChanged(boolean):

    New API must be flagged with @FlaggedApi: method android.telephony.satellite.SatelliteProvisionStateCallback.onSatelliteProvisionStateChanged(boolean)

UnflaggedApi: android.telephony.satellite.SatelliteTransmissionUpdateCallback:

    New API must be flagged with @FlaggedApi: class android.telephony.satellite.SatelliteTransmissionUpdateCallback

UnflaggedApi: android.telephony.satellite.SatelliteTransmissionUpdateCallback#onReceiveDatagramStateChanged(int, int, int):

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ package android.app.admin { 
    field public static final int OPERATION_SET_APPLICATION_HIDDEN = 15; // 0xf

    field public static final int OPERATION_SET_APPLICATION_RESTRICTIONS = 16; // 0x10

    field public static final int OPERATION_SET_CAMERA_DISABLED = 31; // 0x1f

    field @FlaggedApi("android.view.contentprotection.flags.manage_device_policy_enabled") public static final int OPERATION_SET_CONTENT_PROTECTION_POLICY = 41; // 0x29

    field public static final int OPERATION_SET_FACTORY_RESET_PROTECTION_POLICY = 32; // 0x20

    field public static final int OPERATION_SET_GLOBAL_PRIVATE_DNS = 33; // 0x21

    field public static final int OPERATION_SET_KEEP_UNINSTALLED_PACKAGES = 17; // 0x11