commit 7ed4041b7943fa4faa7eaa09bc1ee3d9d3521569
author Jason Parks <jparks@google.com> Fri Oct 11 15:15:44 2024 +0000
committer Jason Parks <jparks@google.com> Fri Oct 11 15:15:44 2024 +0000
tree 3a03b48c13117c45e1b17e7f2dc118d8fa9d98c5
parent 3b0072a7e83d39b8eeee9ca2173d07cac147fa6d

Disable SupervisionService on Wear

Test: build and boot
Bug: 371489328
Flag: android.app.supervision.flags.supervision_api
Change-Id: I3096d49e211da4db78183cd35b7d1fc0d3ffba1c

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

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 7ea1dcd..fa3674d 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1617,7 +1617,7 @@
             mSystemServiceManager.startService(ROLE_SERVICE_CLASS);
             t.traceEnd();
 
-            if (android.app.supervision.flags.Flags.supervisionApi()) {
+            if (!isWatch && android.app.supervision.flags.Flags.supervisionApi()) {
                 t.traceBegin("StartSupervisionService");
                 mSystemServiceManager.startService(SupervisionService.Lifecycle.class);
                 t.traceEnd();