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

Commit 0fdbca22 authored by Bob Wang's avatar Bob Wang Committed by Automerger Merge Worker
Browse files

Merge "Cleanup backup_service_security_log_event_enabled" into main am: c75538c8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3282740



Change-Id: I51e56017bb122cb06bc20e17d822f4a7d5e0c268
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b0e8d09 c75538c8

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8596,7 +8596,7 @@ package android.app.admin { 
    field public static final int TAG_ADB_SHELL_CMD = 210002; // 0x33452

    field public static final int TAG_ADB_SHELL_INTERACTIVE = 210001; // 0x33451

    field public static final int TAG_APP_PROCESS_START = 210005; // 0x33455

    field @FlaggedApi("android.app.admin.flags.backup_service_security_log_event_enabled") public static final int TAG_BACKUP_SERVICE_TOGGLED = 210044; // 0x3347c

    field public static final int TAG_BACKUP_SERVICE_TOGGLED = 210044; // 0x3347c

    field public static final int TAG_BLUETOOTH_CONNECTION = 210039; // 0x33477

    field public static final int TAG_BLUETOOTH_DISCONNECTION = 210040; // 0x33478

    field public static final int TAG_CAMERA_POLICY_SET = 210034; // 0x33472

core/java/android/app/admin/SecurityLog.java

+0 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 


package android.app.admin;



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



import android.Manifest;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -611,7 +608,6 @@ public class SecurityLog { 
     * <li> [2] backup service state ({@code Integer}, 1 for enabled, 0 for disabled)

     * @see DevicePolicyManager#setBackupServiceEnabled(ComponentName, boolean)

     */

    @FlaggedApi(FLAG_BACKUP_SERVICE_SECURITY_LOG_EVENT_ENABLED)

    public static final int TAG_BACKUP_SERVICE_TOGGLED =

            SecurityLogTags.SECURITY_BACKUP_SERVICE_TOGGLED;

    /**

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

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ flag { 
  bug: "293441361"

}



# Fully rolled out and must not be used.

flag {

  name: "assist_content_user_restriction_enabled"

  is_exported: true
@@ -164,6 +165,7 @@ flag { 
    }

}



# Fully rolled out and must not be used.

flag {

  name: "backup_service_security_log_event_enabled"

  is_exported: true

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

+3 −5
Original line number Diff line number Diff line
@@ -18578,13 +18578,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 














        toggleBackupServiceActive(caller.getUserId(), enabled);



























        if (Flags.backupServiceSecurityLogEventEnabled()) {















        if (SecurityLog.isLoggingEnabled()) {















            SecurityLog.writeEvent(SecurityLog.TAG_BACKUP_SERVICE_TOGGLED,















                    caller.getPackageName(), caller.getUserId(), enabled ? 1 : 0);















        }















    }













    }





























    @Override















    public boolean isBackupServiceEnabled(ComponentName admin) {