commit 9ea48c7118db41e8001f9ce166e76c4b1ae3f80d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Oct 11 17:22:59 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 11 17:22:59 2024 +0000
tree 08ba278d020e31d7cc62ebe482764efa4b80fca0
parent 9fd18b8077347bf577556696ca364f952d955bd3
parent 7ed4041b7943fa4faa7eaa09bc1ee3d9d3521569

Merge "Disable SupervisionService on Wear" into main

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 6c97992..b9727f9 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();