From 5ea8a1fbe232b55f5798adda96f4a5179121bf03 Mon Sep 17 00:00:00 2001 From: Salud Lemus Date: Wed, 2 Feb 2022 13:09:54 -0800 Subject: [PATCH] Expose device owner type constants for CTS tests This is necessary to be able to use them in the Bedstead test infra. Bug: 216852998 Test: None (trivial change) Change-Id: Ib5afccc65d357b893d193b91b78f59f32b9e2811 --- core/api/test-current.txt | 2 ++ core/java/android/app/admin/DevicePolicyManager.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/api/test-current.txt b/core/api/test-current.txt index c39394bb1e4fa..d7e5cfd2e0899 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -484,6 +484,8 @@ package android.app.admin { field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED"; field public static final String ACTION_DEVICE_POLICY_CONSTANTS_CHANGED = "android.app.action.DEVICE_POLICY_CONSTANTS_CHANGED"; field @Deprecated public static final int CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER = 14; // 0xe + field public static final int DEVICE_OWNER_TYPE_DEFAULT = 0; // 0x0 + field public static final int DEVICE_OWNER_TYPE_FINANCED = 1; // 0x1 field public static final int OPERATION_CLEAR_APPLICATION_USER_DATA = 23; // 0x17 field public static final int OPERATION_CREATE_AND_MANAGE_USER = 5; // 0x5 field public static final int OPERATION_INSTALL_CA_CERT = 24; // 0x18 diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 9ac4030c73a79..c0fbc9457c88b 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3250,6 +3250,7 @@ public class DevicePolicyManager { * * @hide */ + @TestApi public static final int DEVICE_OWNER_TYPE_DEFAULT = 0; /** @@ -3257,6 +3258,7 @@ public class DevicePolicyManager { * * @hide */ + @TestApi public static final int DEVICE_OWNER_TYPE_FINANCED = 1; /**