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

Commit ca02dae8 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge changes from topics "dpe-dumpsys-flag-cleanup", "hsum-do-flag-cleanup" into main 

* changes:
  Clean up fully rolled out HeadlessDeviceOwnerSingleUserEnabled
  Clean up fully rolled out DumpsysPolicyEngineMigrationEnabled
parents 1f4bce7d e2997126

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7875,7 +7875,7 @@ package android.app.admin { 
    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.DeviceAdminInfo> CREATOR;

    field public static final int HEADLESS_DEVICE_OWNER_MODE_AFFILIATED = 1; // 0x1

    field @FlaggedApi("android.app.admin.flags.headless_device_owner_single_user_enabled") public static final int HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER = 2; // 0x2

    field public static final int HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER = 2; // 0x2

    field public static final int HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED = 0; // 0x0

    field public static final int USES_ENCRYPTED_STORAGE = 7; // 0x7

    field public static final int USES_POLICY_DISABLE_CAMERA = 8; // 0x8

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1422,7 +1422,7 @@ package android.app.admin { 
    field public static final int STATUS_DEVICE_ADMIN_NOT_SUPPORTED = 13; // 0xd

    field public static final int STATUS_HAS_DEVICE_OWNER = 1; // 0x1

    field public static final int STATUS_HAS_PAIRED = 8; // 0x8

    field @FlaggedApi("android.app.admin.flags.headless_device_owner_single_user_enabled") public static final int STATUS_HEADLESS_ONLY_SYSTEM_USER = 17; // 0x11

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

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

    field public static final int STATUS_MANAGED_USERS_NOT_SUPPORTED = 9; // 0x9

    field public static final int STATUS_NONSYSTEM_USER_EXISTS = 5; // 0x5

core/java/android/app/admin/DeviceAdminInfo.java

+0 −4
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package android.app.admin;



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



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.app.admin.flags.Flags;
@@ -195,7 +192,6 @@ public final class DeviceAdminInfo implements Parcelable { 
     * DPCs should set the value of attribute "headless-device-owner-mode" inside the

     * "headless-system-user" tag as "single_user".

     */

    @FlaggedApi(FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED)

    public static final int HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER = 2;



    /**

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

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import static android.app.admin.flags.Flags.FLAG_DEVICE_THEFT_API_ENABLED; 
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.onboardingBugreportV2Enabled;

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

import static android.app.admin.flags.Flags.FLAG_IS_MTE_POLICY_ENFORCED;
@@ -2988,7 +2987,6 @@ public class DevicePolicyManager { 
     * @hide

     */

    @SystemApi

    @FlaggedApi(FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED)

    public static final int STATUS_HEADLESS_ONLY_SYSTEM_USER = 17;















    /**

































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



+1
−7






























Original line number
Diff line number
Diff line








@@ -124,13 +124,6 @@ flag {













  }















}





























flag {













  name: "dumpsys_policy_engine_migration_enabled"













  namespace: "enterprise"













  description: "Update DumpSys to include information about migrated APIs in DPE"













  bug: "304999634"













}





























flag {















    name: "allow_querying_profile_type"















    is_exported: true










@@ -180,6 +173,7 @@ flag {













  bug: "295301164"















}





























# Fully rolled out and must not be used.















flag {















  name: "headless_device_owner_single_user_enabled"















  is_exported: true