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

Commit b427c86e authored by Vitor Carvalho's avatar Vitor Carvalho Committed by Android (Google) Code Review
Browse files

Merge "Add a flag to enable the SupervisionService on Wear devices." into main

parents 5508c034 fe1b5d93

core/java/android/app/supervision/flags.aconfig

+9 −1
Original line number Diff line number Diff line
@@ -8,3 +8,11 @@ flag { 
  description: "Flag to enable the SupervisionService"

  bug: "340351729"

}



flag {

  name: "supervision_api_on_wear"

  is_exported: true

  namespace: "supervision"

  description: "Flag to enable the SupervisionService on Wear devices"

  bug: "373358935"

}

services/java/com/android/server/SystemServer.java

+2 −1
Original line number Diff line number Diff line
@@ -1621,7 +1621,8 @@ public final class SystemServer implements Dumpable { 
            mSystemServiceManager.startService(ROLE_SERVICE_CLASS);

            t.traceEnd();



            if (!isWatch && android.app.supervision.flags.Flags.supervisionApi()) {

            if (android.app.supervision.flags.Flags.supervisionApi()

                    && (!isWatch || android.app.supervision.flags.Flags.supervisionApiOnWear())) {

                t.traceBegin("StartSupervisionService");

                mSystemServiceManager.startService(SupervisionService.Lifecycle.class);

                t.traceEnd();