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

Commit 9d07e069 authored by Kholoud Mohamed's avatar Kholoud Mohamed
Browse files

Expose getHeadlessDeviceOwnerMode as testAPI 

Fixes: 336630878
Test: btest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSecurityLoggingDelegate
Change-Id: I21a1539c9eec7d970443422001e2000d17061e1d
parent 8e1ad154

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ package android.app.admin { 
    method @Deprecated public int getDeviceOwnerType(@NonNull android.content.ComponentName);

    method @Nullable public String getDevicePolicyManagementRoleHolderUpdaterPackage();

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

    method @FlaggedApi("android.app.admin.flags.headless_device_owner_provisioning_fix_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public int getHeadlessDeviceOwnerMode();

    method public long getLastBugReportRequestTime();

    method public long getLastNetworkLogRetrievalTime();

    method public long getLastSecurityLogRetrievalTime();

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

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import static android.app.admin.flags.Flags.FLAG_DEVICE_POLICY_SIZE_TRACKING_INT 
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.FLAG_SECURITY_LOG_V2_ENABLED;

import static android.app.admin.flags.Flags.onboardingBugreportV2Enabled;
@@ -17724,6 +17725,9 @@ public class DevicePolicyManager { 
     *

     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_HEADLESS_DEVICE_OWNER_PROVISIONING_FIX_ENABLED)

    @RequiresPermission(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)

    @DeviceAdminInfo.HeadlessDeviceOwnerMode

    public int getHeadlessDeviceOwnerMode() {

        if (!Flags.headlessDeviceOwnerProvisioningFixEnabled()) {