diff options
| author | 2025-03-11 10:50:06 -0700 | |
|---|---|---|
| committer | 2025-03-11 10:50:06 -0700 | |
| commit | 3fe3512c75b170c1977da110e6d14894fe9e15be (patch) | |
| tree | 16402cd271f208f3974b5a16b0db06b596c8e121 | |
| parent | f1ea2197f2daf5e0bcb26ad81f95a6c28e10426a (diff) | |
| parent | 72e2d7e5f332450f7739d3d6054e58643d1fac72 (diff) | |
Merge "Expose createConfirmSupervisionCredentialsIntent API behind a flag" into main
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/supervision/SupervisionManager.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 32b170a6286b..cd7e434d30d9 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -2941,6 +2941,7 @@ package android.app.smartspace.uitemplatedata { package android.app.supervision { @FlaggedApi("android.app.supervision.flags.supervision_manager_apis") public class SupervisionManager { + method @FlaggedApi("android.app.supervision.flags.supervision_manager_apis") @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_USERS}) public android.content.Intent createConfirmSupervisionCredentialsIntent(); method @FlaggedApi("android.app.supervision.flags.supervision_manager_apis") @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_USERS}) public boolean isSupervisionEnabled(); } diff --git a/core/java/android/app/supervision/SupervisionManager.java b/core/java/android/app/supervision/SupervisionManager.java index 8217ca1953ab..172ed2358a5d 100644 --- a/core/java/android/app/supervision/SupervisionManager.java +++ b/core/java/android/app/supervision/SupervisionManager.java @@ -97,6 +97,8 @@ public class SupervisionManager { * * @hide */ + @SystemApi + @FlaggedApi(Flags.FLAG_SUPERVISION_MANAGER_APIS) @RequiresPermission(anyOf = {MANAGE_USERS, QUERY_USERS}) @Nullable public Intent createConfirmSupervisionCredentialsIntent() { |