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

Commit 3fe3512c authored by Zhou Liu's avatar Zhou Liu Committed by Android (Google) Code Review
Browse files

Merge "Expose createConfirmSupervisionCredentialsIntent API behind a flag" into main

parents f1ea2197 72e2d7e5

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();















  }







































core/java/android/app/supervision/SupervisionManager.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -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() {