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

Commit 32f78c5e authored by Cintia Martins's avatar Cintia Martins Committed by Android (Google) Code Review
Browse files

Merge "Enable the SupervisionAppService onEnabled() and onDisabled() API behind a flag" into main

parents c7ed4da1 14ccff70

core/api/system-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -2940,6 +2940,13 @@ package android.app.smartspace.uitemplatedata { 














package android.app.supervision {



























  @FlaggedApi("android.app.supervision.flags.enable_supervision_app_service") public class SupervisionAppService extends android.app.Service {













    ctor public SupervisionAppService();













    method @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent);













    method @FlaggedApi("android.app.supervision.flags.enable_supervision_app_service") public void onDisabled();













    method @FlaggedApi("android.app.supervision.flags.enable_supervision_app_service") public void onEnabled();













  }



























  @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/SupervisionAppService.java



+27
−11




























Original line number
Diff line number
Diff line








@@ -16,7 +16,11 @@





























package android.app.supervision;





























import android.annotation.FlaggedApi;













import android.annotation.Nullable;













import android.annotation.SystemApi;















import android.app.Service;













import android.app.supervision.flags.Flags;















import android.content.Intent;















import android.os.IBinder;

























@@ -26,8 +30,11 @@ import android.os.IBinder;













 *















 * @hide















 */













@SystemApi













@FlaggedApi(Flags.FLAG_ENABLE_SUPERVISION_APP_SERVICE)















public class SupervisionAppService extends Service {













    private final ISupervisionAppService mBinder = new ISupervisionAppService.Stub() {













    private final ISupervisionAppService mBinder =













            new ISupervisionAppService.Stub() {















                @Override















                public void onEnabled() {















                    SupervisionAppService.this.onEnabled();









@@ -39,18 +46,27 @@ public class SupervisionAppService extends Service {













                }















            };





























    @Nullable















    @Override













    public final IBinder onBind(Intent intent) {













    public final IBinder onBind(@Nullable Intent intent) {















        return mBinder.asBinder();















    }































    /**















     * Called when supervision is enabled.













     *













     * @hide















     */













    @SystemApi













    @FlaggedApi(Flags.FLAG_ENABLE_SUPERVISION_APP_SERVICE)















    public void onEnabled() {}































    /**















     * Called when supervision is disabled.













     *













     * @hide















     */













    @SystemApi













    @FlaggedApi(Flags.FLAG_ENABLE_SUPERVISION_APP_SERVICE)















    public void onDisabled() {}















}