commit 48978e4e872e292258aa3f5f3978e933d2ba47ff
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Feb 25 08:49:48 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 25 08:49:48 2025 -0800
tree 5aa846c3e84e0404342878ee8a49f490817eb07d
parent 6cd3ed3cf25a686a16e3013c12e33f2f0180eebf
parent a8b8baf973702f3759cf98fe6427b7a7628f6ff9

Merge "Disable AdvancedProtectionService on desktop" 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 e158310..860b6fb 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1814,7 +1814,7 @@
                 t.traceEnd();
             }
 
-            if (!isWatch && !isTv && !isAutomotive
+            if (!isWatch && !isTv && !isAutomotive && !isDesktop
                     && android.security.Flags.aapmApi()) {
                 t.traceBegin("StartAdvancedProtectionService");
                 mSystemServiceManager.startService(AdvancedProtectionService.Lifecycle.class);