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

Commit 2a8cf295 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename enable and disable methods" into main

parents 52fb297e cbad2c8a

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2962,8 +2962,8 @@ 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();

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

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

  }















  @FlaggedApi("android.app.supervision.flags.supervision_manager_apis") public class SupervisionManager {

























core/java/android/app/supervision/SupervisionAppService.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -50,9 +50,9 @@ public class SupervisionAppService extends Service {













                @Override















                public void onSetSupervisionEnabled(int userId, boolean enabled) {















                    if (enabled) {













                        SupervisionAppService.this.onEnabled();













                        SupervisionAppService.this.onSupervisionEnabled();















                    } else {













                        SupervisionAppService.this.onDisabled();













                        SupervisionAppService.this.onSupervisionDisabled();















                    }















                }















            };









@@ -70,7 +70,7 @@ public class SupervisionAppService extends Service {













     */















    @SystemApi















    @FlaggedApi(Flags.FLAG_ENABLE_SUPERVISION_APP_SERVICE)













    public void onEnabled() {}













    public void onSupervisionEnabled() {}































    /**















     * Called when supervision is disabled.









@@ -79,5 +79,5 @@ public class SupervisionAppService extends Service {













     */















    @SystemApi















    @FlaggedApi(Flags.FLAG_ENABLE_SUPERVISION_APP_SERVICE)













    public void onDisabled() {}













    public void onSupervisionDisabled() {}















}