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

Commit 8f51ac72 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Clean up fully rolled out SecurityLogV2Enabled 

Flag was rolled out in Android V. Keeping flag definition since it is
exported.

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I60f473e5afa84ca22506c28f8edc52f233da3f08
parent e252157b

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7968,7 +7968,7 @@ package android.app.admin { 
    field public static final String PERMISSION_GRANT_POLICY = "permissionGrant";

    field public static final String PERSISTENT_PREFERRED_ACTIVITY_POLICY = "persistentPreferredActivity";

    field public static final String RESET_PASSWORD_TOKEN_POLICY = "resetPasswordToken";

    field @FlaggedApi("android.app.admin.flags.security_log_v2_enabled") public static final String SECURITY_LOGGING_POLICY = "securityLogging";

    field public static final String SECURITY_LOGGING_POLICY = "securityLogging";

    field public static final String STATUS_BAR_DISABLED_POLICY = "statusBarDisabled";

    field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";

    field public static final String USER_CONTROL_DISABLED_PACKAGES_POLICY = "userControlDisabledPackages";

core/api/system-current.txt

+6 −6
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ package android { 
    field public static final String MANAGE_DEFAULT_APPLICATIONS = "android.permission.MANAGE_DEFAULT_APPLICATIONS";

    field public static final String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";

    field public static final String MANAGE_DEVICE_POLICY_APP_EXEMPTIONS = "android.permission.MANAGE_DEVICE_POLICY_APP_EXEMPTIONS";

    field @FlaggedApi("android.app.admin.flags.security_log_v2_enabled") public static final String MANAGE_DEVICE_POLICY_AUDIT_LOGGING = "android.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING";

    field public static final String MANAGE_DEVICE_POLICY_AUDIT_LOGGING = "android.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING";

    field @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public static final String MANAGE_ENHANCED_CONFIRMATION_STATES = "android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES";

    field public static final String MANAGE_ETHERNET_NETWORKS = "android.permission.MANAGE_ETHERNET_NETWORKS";

    field public static final String MANAGE_FACTORY_RESET_PROTECTION = "android.permission.MANAGE_FACTORY_RESET_PROTECTION";
@@ -1296,7 +1296,7 @@ package android.app.admin { 
  }















  public final class DevicePolicyIdentifiers {













    field @FlaggedApi("android.app.admin.flags.security_log_v2_enabled") public static final String AUDIT_LOGGING_POLICY = "auditLogging";













    field public static final String AUDIT_LOGGING_POLICY = "auditLogging";















  }





























  public class DevicePolicyKeyguardService extends android.app.Service {









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



























  public class DevicePolicyManager {















    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public int checkProvisioningPrecondition(@NonNull String, @NonNull String);













    method @FlaggedApi("android.app.admin.flags.security_log_v2_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public void clearAuditLogEventCallback();













    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public void clearAuditLogEventCallback();















    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public android.os.UserHandle createAndProvisionManagedProfile(@NonNull android.app.admin.ManagedProfileProvisioningParams) throws android.app.admin.ProvisioningException;















    method @Nullable public android.content.Intent createProvisioningIntentFromNfcIntent(@NonNull android.content.Intent);















    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void finalizeWorkProfileProvisioning(@NonNull android.os.UserHandle, @Nullable android.accounts.Account);









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













    method @Nullable public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException;















    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException;















    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public int getUserProvisioningState();













    method @FlaggedApi("android.app.admin.flags.security_log_v2_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public boolean isAuditLogEnabled();













    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public boolean isAuditLogEnabled();















    method public boolean isDeviceManaged();















    method @FlaggedApi("android.app.admin.flags.device_theft_api_enabled") @RequiresPermission(android.Manifest.permission.QUERY_DEVICE_STOLEN_STATE) public boolean isDevicePotentiallyStolen();















    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isDeviceProvisioned();









@@ -1344,8 +1344,8 @@ package android.app.admin {













    method @RequiresPermission(android.Manifest.permission.TRIGGER_LOST_MODE) public void sendLostModeLocationUpdate(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);















    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException;















    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_APP_EXEMPTIONS) public void setApplicationExemptions(@NonNull String, @NonNull java.util.Set<java.lang.Integer>) throws android.content.pm.PackageManager.NameNotFoundException;













    method @FlaggedApi("android.app.admin.flags.security_log_v2_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public void setAuditLogEnabled(boolean);













    method @FlaggedApi("android.app.admin.flags.security_log_v2_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public void setAuditLogEventCallback(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.admin.SecurityLog.SecurityEvent>>);













    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public void setAuditLogEnabled(boolean);













    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public void setAuditLogEventCallback(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.admin.SecurityLog.SecurityEvent>>);















    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setDeviceProvisioningConfigApplied();















    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setDpcDownloaded(boolean);















    method @FlaggedApi("android.app.admin.flags.device_policy_size_tracking_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setMaxPolicyStorageLimit(int);

























core/java/android/app/admin/DevicePolicyIdentifiers.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













package android.app.admin;































import static android.app.admin.flags.Flags.FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED;













import static android.app.admin.flags.Flags.FLAG_SECURITY_LOG_V2_ENABLED;































import android.annotation.FlaggedApi;















import android.annotation.NonNull;










@@ -50,7 +49,6 @@ public final class DevicePolicyIdentifiers {













    /**















     * String identifier for {@link DevicePolicyManager#setSecurityLoggingEnabled}.















     */













    @FlaggedApi(FLAG_SECURITY_LOG_V2_ENABLED)















    public static final String SECURITY_LOGGING_POLICY = "securityLogging";































    /**









@@ -58,7 +56,6 @@ public final class DevicePolicyIdentifiers {













     *















     * @hide















     */













    @FlaggedApi(FLAG_SECURITY_LOG_V2_ENABLED)















    @SystemApi















    public static final String AUDIT_LOGGING_POLICY = "auditLogging";

















































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



+0
−5




























Original line number
Diff line number
Diff line








@@ -60,7 +60,6 @@ import static android.app.admin.flags.Flags.FLAG_ESIM_MANAGEMENT_ENABLED;













import static android.app.admin.flags.Flags.FLAG_DEVICE_POLICY_SIZE_TRACKING_ENABLED;















import static android.app.admin.flags.Flags.FLAG_HEADLESS_DEVICE_OWNER_PROVISIONING_FIX_ENABLED;















import static android.app.admin.flags.Flags.FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED;













import static android.app.admin.flags.Flags.FLAG_SECURITY_LOG_V2_ENABLED;















import static android.app.admin.flags.Flags.onboardingBugreportV2Enabled;















import static android.app.admin.flags.Flags.onboardingConsentlessBugreports;















import static android.app.admin.flags.Flags.FLAG_IS_MTE_POLICY_ENFORCED;










@@ -14335,7 +14334,6 @@ public class DevicePolicyManager {













     * @hide















     */















    @SystemApi













    @FlaggedApi(FLAG_SECURITY_LOG_V2_ENABLED)















    @RequiresPermission(permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING)















    public void setAuditLogEnabled(boolean enabled) {















        throwIfParentInstance("setAuditLogEnabled");









@@ -14352,7 +14350,6 @@ public class DevicePolicyManager {













     * @hide















     */















    @SystemApi













    @FlaggedApi(FLAG_SECURITY_LOG_V2_ENABLED)















    @RequiresPermission(permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING)















    public boolean isAuditLogEnabled() {















        throwIfParentInstance("isAuditLogEnabled");









@@ -14374,7 +14371,6 @@ public class DevicePolicyManager {













     * @hide















     */















    @SystemApi













    @FlaggedApi(FLAG_SECURITY_LOG_V2_ENABLED)















    @RequiresPermission(permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING)















    public void setAuditLogEventCallback(















            @NonNull @CallbackExecutor Executor executor,









@@ -14401,7 +14397,6 @@ public class DevicePolicyManager {













     * @hide















     */















    @SystemApi













    @FlaggedApi(FLAG_SECURITY_LOG_V2_ENABLED)















    @RequiresPermission(permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING)















    public void clearAuditLogEventCallback() {















        throwIfParentInstance("clearAuditLogEventCallback");

























core/java/android/app/admin/flags/flags.aconfig



+1
−0




























Original line number
Diff line number
Diff line








@@ -105,6 +105,7 @@ flag {













  bug: "289520697"















}





























# Fully rolled out and must not be used.















flag {















  name: "security_log_v2_enabled"















  is_exported: true